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

Commit 924a0aa7 authored by Colin Cross's avatar Colin Cross
Browse files

Update turbine command line flags 

The latest version of turbine requires a -- after the javac
options, and uses multiple --bootclasspath arguments instead
of a javac-style colon separated list.

Test: m javac-check
Bug: 74339924
Change-Id: Ib7096294a43e9bd30abc36751299bfac7879f765
parent a052599b

java/builder.go

+3 −3
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ var ( 
				`${config.JavaCmd} -jar ${config.TurbineJar} --output $out.tmp ` +

				`${config.JavaCmd} -jar ${config.TurbineJar} --output $out.tmp ` +

				`--temp_dir "$outDir" --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 && ` +

				`${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{
@@ -242,7 +242,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. 
		// ensure java does not fall back to the default bootclasspath.

		// ensure java does not fall back to the default bootclasspath.

		bootClasspath = `--bootclasspath ""`

		bootClasspath = `--bootclasspath ""`

	} else {

	} else {

		bootClasspath = flags.bootClasspath.FormJavaClassPath("--bootclasspath")

		bootClasspath = strings.Join(flags.bootClasspath.FormDesugarClasspath("--bootclasspath"), " ")

	}

	}





	ctx.Build(pctx, android.BuildParams{

	ctx.Build(pctx, android.BuildParams{
@@ -255,7 +255,7 @@ 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(), " "),

			"classpath":     flags.classpath.FormJavaClassPath("--classpath"),

			"classpath":     strings.Join(flags.classpath.FormDesugarClasspath("--classpath"), " "),

			"outDir":        android.PathForModuleOut(ctx, "turbine", "classes").String(),

			"outDir":        android.PathForModuleOut(ctx, "turbine", "classes").String(),

			"javaVersion":   flags.javaVersion,

			"javaVersion":   flags.javaVersion,

		},

		},