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

Merge "Don't use ziptime or --temp_dir for turbine" am: e311abcd44

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030723

Change-Id: I88dfba08c5e64a7da4673dc8674e8ea579cc85b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-03-28 18:27:18 +00:00
committed by Automerger Merge Worker
parent 42f6e1f4f0 e311abcd44
commit 79e93d626a
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
java/builder.go
View File

@@ -131,31 +131,27 @@ var (
turbine, turbineRE = pctx.RemoteStaticRules("turbine", turbine, turbineRE = pctx.RemoteStaticRules("turbine",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + Command: `$reTemplate${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} --output $out.tmp ` +
`$reTemplate${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} --output $out.tmp ` + `--sources @$out.rsp --source_jars $srcJars ` +
`--temp_dir "$outDir" --sources @$out.rsp --source_jars $srcJars ` +
`--javacopts ${config.CommonJdkFlags} ` + `--javacopts ${config.CommonJdkFlags} ` +
`$javacFlags -source $javaVersion -target $javaVersion -- $bootClasspath $classpath && ` + `$javacFlags -source $javaVersion -target $javaVersion -- $bootClasspath $classpath && ` +
`${config.Ziptime} $out.tmp && ` +
`(if cmp -s $out.tmp $out ; then rm $out.tmp ; else mv $out.tmp $out ; fi )`, `(if cmp -s $out.tmp $out ; then rm $out.tmp ; else mv $out.tmp $out ; fi )`,
CommandDeps: []string{ CommandDeps: []string{
"${config.TurbineJar}", "${config.TurbineJar}",
"${config.JavaCmd}", "${config.JavaCmd}",
"${config.Ziptime}",
}, },
Rspfile: "$out.rsp", Rspfile: "$out.rsp",
RspfileContent: "$in", RspfileContent: "$in",
Restat: true, Restat: true,
}, },
&remoteexec.REParams{Labels: map[string]string{"type": "tool", "name": "turbine"}, &remoteexec.REParams{Labels: map[string]string{"type": "tool", "name": "turbine"},
ExecStrategy: "${config.RETurbineExecStrategy}", ExecStrategy: "${config.RETurbineExecStrategy}",
Inputs: []string{"${config.TurbineJar}", "${out}.rsp", "$implicits"}, Inputs: []string{"${config.TurbineJar}", "${out}.rsp", "$implicits"},
RSPFiles: []string{"${out}.rsp"}, RSPFiles: []string{"${out}.rsp"},
OutputFiles: []string{"$out.tmp"}, OutputFiles: []string{"$out.tmp"},
OutputDirectories: []string{"$outDir"}, ToolchainInputs: []string{"${config.JavaCmd}"},
ToolchainInputs: []string{"${config.JavaCmd}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, }, []string{"javacFlags", "bootClasspath", "classpath", "srcJars", "javaVersion"}, []string{"implicits"})
}, []string{"javacFlags", "bootClasspath", "classpath", "srcJars", "outDir", "javaVersion"}, []string{"implicits"})
jar, jarRE = pctx.RemoteStaticRules("jar", jar, jarRE = pctx.RemoteStaticRules("jar",
blueprint.RuleParams{ blueprint.RuleParams{
@@ -392,7 +388,6 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android.
"bootClasspath": bootClasspath, "bootClasspath": bootClasspath,
"srcJars": strings.Join(srcJars.Strings(), " "), "srcJars": strings.Join(srcJars.Strings(), " "),
"classpath": classpath.FormTurbineClassPath("--classpath "), "classpath": classpath.FormTurbineClassPath("--classpath "),
"outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(),
"javaVersion": flags.javaVersion.String(), "javaVersion": flags.javaVersion.String(),
} }
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") {