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

Use turbine's native source jar support

Browse Source 
Turbine doesn't need extract_srcjars.sh, just pass the source jars
with --source_jars.

Bug: 74339924
Test: m checkbuild
Change-Id: Ie7fe06f5a9f5e29287cf79c2d46b23a676a03d41
Merged-In: Ie7fe06f5a9f5e29287cf79c2d46b23a676a03d41
(cherry picked from commit 6981f658ef)
This commit is contained in:
Colin Cross
2018-03-07 15:14:50 -08:00
parent 070f605485
commit f2986f067b
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/builder.go
View File

@@ -104,10 +104,9 @@ var (
turbine = pctx.AndroidStaticRule("turbine", turbine = pctx.AndroidStaticRule("turbine",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf "$outDir" "$srcJarDir" && mkdir -p "$outDir" "$srcJarDir" && ` + Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
`${config.ExtractSrcJarsCmd} $srcJarDir $srcJarDir/list $srcJars && ` +
`${config.JavaCmd} -jar ${config.TurbineJar} --output $out.tmp ` + `${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} ` + `--javacopts ${config.CommonJdkFlags} ` +
`$javacFlags -source $javaVersion -target $javaVersion $bootClasspath $classpath && ` + `$javacFlags -source $javaVersion -target $javaVersion $bootClasspath $classpath && ` +
`${config.Ziptime} $out.tmp && ` + `${config.Ziptime} $out.tmp && ` +
@@ -116,14 +115,12 @@ var (
"${config.TurbineJar}", "${config.TurbineJar}",
"${config.JavaCmd}", "${config.JavaCmd}",
"${config.Ziptime}", "${config.Ziptime}",
"${config.ExtractSrcJarsCmd}",
}, },
Rspfile: "$out.rsp", Rspfile: "$out.rsp",
RspfileContent: "$in", RspfileContent: "$in",
Restat: true, Restat: true,
}, },
"javacFlags", "bootClasspath", "classpath", "srcJars", "srcJarDir", "javacFlags", "bootClasspath", "classpath", "srcJars", "outDir", "javaVersion")
"outDir", "javaVersion")
jar = pctx.AndroidStaticRule("jar", jar = pctx.AndroidStaticRule("jar",
blueprint.RuleParams{ blueprint.RuleParams{
@@ -258,7 +255,6 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android.
"javacFlags": flags.javacFlags, "javacFlags": flags.javacFlags,
"bootClasspath": bootClasspath, "bootClasspath": bootClasspath,
"srcJars": strings.Join(srcJars.Strings(), " "), "srcJars": strings.Join(srcJars.Strings(), " "),
"srcJarDir": android.PathForModuleOut(ctx, "turbine", "srcjars").String(),
"classpath": flags.classpath.FormJavaClassPath("--classpath"), "classpath": flags.classpath.FormJavaClassPath("--classpath"),
"outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(), "outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(),
"javaVersion": flags.javaVersion, "javaVersion": flags.javaVersion,