Snap for 8372459 from a8e2151a3094965107688b6d9241281ddfc42b68 to tm-release (aceb98fb) · Commits · e / os / android_build_soong

java/builder.go

+9 −14

Original line number	Diff line number	Diff line
		@@ -131,17 +131,14 @@ var (

		turbine, turbineRE = pctx.RemoteStaticRules("turbine",
		blueprint.RuleParams{
		Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
		`$reTemplate${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} --output $out.tmp ` +
		`--temp_dir "$outDir" --sources @$out.rsp --source_jars $srcJars ` +
		Command: `$reTemplate${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} --output $out.tmp ` +
		`--sources @$out.rsp --source_jars $srcJars ` +
		`--javacopts ${config.CommonJdkFlags} ` +
		`$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 )`,
		CommandDeps: []string{
		"${config.TurbineJar}",
		"${config.JavaCmd}",
		"${config.Ziptime}",
		},
		Rspfile: "$out.rsp",
		RspfileContent: "$in",
		@@ -152,10 +149,9 @@ var (
		Inputs: []string{"${config.TurbineJar}", "${out}.rsp", "$implicits"},
		RSPFiles: []string{"${out}.rsp"},
		OutputFiles: []string{"$out.tmp"},
		OutputDirectories: []string{"$outDir"},
		ToolchainInputs: []string{"${config.JavaCmd}"},
		Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
		}, []string{"javacFlags", "bootClasspath", "classpath", "srcJars", "outDir", "javaVersion"}, []string{"implicits"})
		}, []string{"javacFlags", "bootClasspath", "classpath", "srcJars", "javaVersion"}, []string{"implicits"})

		jar, jarRE = pctx.RemoteStaticRules("jar",
		blueprint.RuleParams{
		@@ -392,7 +388,6 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android.
		"bootClasspath": bootClasspath,
		"srcJars": strings.Join(srcJars.Strings(), " "),
		"classpath": classpath.FormTurbineClassPath("--classpath "),
		"outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(),
		"javaVersion": flags.javaVersion.String(),
		}
		if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") {