StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I5b8522aa,I541aea75

Browse Source 
am: cdec7e7ee1

Change-Id: Ib68f185498f593f0812f481b2c82753cd5956fa5
This commit is contained in:
Colin Cross
2018-07-16 17:20:20 -07:00
committed by android-build-merger
parent 20075eb84b cdec7e7ee1
commit 0907f39afd
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/dep_fixer/main.go
View File

@@ -29,7 +29,7 @@ import (
func main() { func main() {
flag.Usage = func() { flag.Usage = func() {
fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>") fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>", os.Args[0])
flag.PrintDefaults() flag.PrintDefaults()
} }
output := flag.String("o", "", "Optional output file (defaults to rewriting source if necessary)") output := flag.String("o", "", "Optional output file (defaults to rewriting source if necessary)")

2
cmd/path_interposer/main_test.go
View File

@@ -183,7 +183,7 @@ func TestMissingPath(t *testing.T) {
interposer := setup(t) interposer := setup(t)
err := os.Remove(interposer + "_origpath") err := os.Remove(interposer + "_origpath")
if err != nil { if err != nil {
t.Fatalf("Failed to remove:", err) t.Fatal("Failed to remove:", err)
} }
exitCode, err := Main(ioutil.Discard, ioutil.Discard, interposer, []string{"true"}, mainOpts{}) exitCode, err := Main(ioutil.Discard, ioutil.Discard, interposer, []string{"true"}, mainOpts{})

2
cmd/pom2bp/pom2bp.go
View File

@@ -524,7 +524,7 @@ Usage: %s [--rewrite <regex>=<replace>] [-exclude <module>] [--extra-deps <modul
if pom.IsAar() { if pom.IsAar() {
err := pom.ExtractMinSdkVersion() err := pom.ExtractMinSdkVersion()
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err) fmt.Fprintf(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err)
os.Exit(1) os.Exit(1)
} }
} }

2
java/java.go
View File

@@ -1034,7 +1034,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
// TODO(pszczepaniak): Support kotlin-reflect // TODO(pszczepaniak): Support kotlin-reflect
stripFiles = append(stripFiles, stripFiles = append(stripFiles,
"**/*.kotlin_module", "**/*.kotlin_module",
"**/*.kotlin_builtin") "**/*.kotlin_builtins")
} else { } else {
// Only add kotlin-stdlib if not using (on-device) renamed stdlib // Only add kotlin-stdlib if not using (on-device) renamed stdlib
// (it's expected to be on device bootclasspath) // (it's expected to be on device bootclasspath)