Merge changes I9bec563c,I34f06abd
* changes:
RemoveFromList() should remove all matches
Add unit tests for android/util.go
diff --git a/android/config.go b/android/config.go
index b158e05..db833ec 100644
--- a/android/config.go
+++ b/android/config.go
@@ -649,6 +649,14 @@
return arches
}
+func (c *deviceConfig) BinderBitness() string {
+ is32BitBinder := c.config.ProductVariables.Binder32bit
+ if is32BitBinder != nil && *is32BitBinder {
+ return "32"
+ }
+ return "64"
+}
+
func (c *deviceConfig) VendorPath() string {
if c.config.ProductVariables.VendorPath != nil {
return *c.config.ProductVariables.VendorPath
diff --git a/android/paths.go b/android/paths.go
index cf5544d..3605dcf 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -800,8 +800,8 @@
if len(arches) == 0 {
panic("device build with no primary arch")
}
- primary_arch := arches[0].ArchType.String()
- refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + primary_arch + "/" +
+ binderBitness := ctx.DeviceConfig().BinderBitness()
+ refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + binderBitness + "/" +
archNameAndVariant + "/" + sourceOrBinaryDir + "/" + fileName + ext
return ExistentPathForSource(ctx, refDumpFileStr)
}
diff --git a/cc/cc.go b/cc/cc.go
index ebc98ac..4d26e84 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1423,6 +1423,7 @@
&VndkProperties{},
<OProperties{},
&PgoProperties{},
+ &android.ProtoProperties{},
)
android.InitDefaultsModule(module)
diff --git a/java/builder.go b/java/builder.go
index b8f8351..6d894a3 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -104,10 +104,9 @@
turbine = pctx.AndroidStaticRule("turbine",
blueprint.RuleParams{
- Command: `rm -rf "$outDir" "$srcJarDir" && mkdir -p "$outDir" "$srcJarDir" && ` +
- `${config.ExtractSrcJarsCmd} $srcJarDir $srcJarDir/list $srcJars && ` +
+ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
`${config.JavaCmd} -jar ${config.TurbineJar} --output $out.tmp ` +
- `--temp_dir "$outDir" --sources @$out.rsp @$srcJarDir/list ` +
+ `--temp_dir "$outDir" --sources @$out.rsp --source_jars $srcJars ` +
`--javacopts ${config.CommonJdkFlags} ` +
`$javacFlags -source $javaVersion -target $javaVersion $bootClasspath $classpath && ` +
`${config.Ziptime} $out.tmp && ` +
@@ -116,14 +115,12 @@
"${config.TurbineJar}",
"${config.JavaCmd}",
"${config.Ziptime}",
- "${config.ExtractSrcJarsCmd}",
},
Rspfile: "$out.rsp",
RspfileContent: "$in",
Restat: true,
},
- "javacFlags", "bootClasspath", "classpath", "srcJars", "srcJarDir",
- "outDir", "javaVersion")
+ "javacFlags", "bootClasspath", "classpath", "srcJars", "outDir", "javaVersion")
jar = pctx.AndroidStaticRule("jar",
blueprint.RuleParams{
@@ -258,7 +255,6 @@
"javacFlags": flags.javacFlags,
"bootClasspath": bootClasspath,
"srcJars": strings.Join(srcJars.Strings(), " "),
- "srcJarDir": android.PathForModuleOut(ctx, "turbine", "srcjars").String(),
"classpath": flags.classpath.FormJavaClassPath("--classpath"),
"outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(),
"javaVersion": flags.javaVersion,
diff --git a/java/java.go b/java/java.go
index c4c07f7..92170e6 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1280,6 +1280,7 @@
module.AddProperties(
&CompilerProperties{},
&CompilerDeviceProperties{},
+ &android.ProtoProperties{},
)
android.InitDefaultsModule(module)
diff --git a/ui/build/config.go b/ui/build/config.go
index 27ed8e9..a1b5bd4 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -115,6 +115,8 @@
// Tell python not to spam the source tree with .pyc files.
ret.environ.Set("PYTHONDONTWRITEBYTECODE", "1")
+ ret.environ.Set("TMPDIR", absPath(ctx, ret.TempDir()))
+
// Precondition: the current directory is the top of the source tree
if _, err := os.Stat(srcDirFileCheck); err != nil {
if os.IsNotExist(err) {