Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6981f658 authored by Colin Cross's avatar Colin Cross
Browse files

Use turbine's native source jar support 

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

Bug: 74339924
Test: m checkbuild
Change-Id: Ie7fe06f5a9f5e29287cf79c2d46b23a676a03d41
parent 72ce0643

java/builder.go

+3 −7
Original line number Diff line number Diff line
@@ -104,10 +104,9 @@ var ( 


	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 @@ var ( 
				"${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 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. 
			"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,