From 924a0aa7d51bc1a4a6e5c57870fe6211faeef545 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 7 Mar 2018 10:51:05 -0800 Subject: [PATCH] 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 --- java/builder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/builder.go b/java/builder.go index 6d894a338..ee0d8a830 100644 --- a/java/builder.go +++ b/java/builder.go @@ -108,7 +108,7 @@ var ( `${config.JavaCmd} -jar ${config.TurbineJar} --output $out.tmp ` + `--temp_dir "$outDir" --sources @$out.rsp --source_jars $srcJars ` + `--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 )`, CommandDeps: []string{ @@ -242,7 +242,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. // ensure java does not fall back to the default bootclasspath. bootClasspath = `--bootclasspath ""` } else { - bootClasspath = flags.bootClasspath.FormJavaClassPath("--bootclasspath") + bootClasspath = strings.Join(flags.bootClasspath.FormDesugarClasspath("--bootclasspath"), " ") } ctx.Build(pctx, android.BuildParams{ @@ -255,7 +255,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. "javacFlags": flags.javacFlags, "bootClasspath": bootClasspath, "srcJars": strings.Join(srcJars.Strings(), " "), - "classpath": flags.classpath.FormJavaClassPath("--classpath"), + "classpath": strings.Join(flags.classpath.FormDesugarClasspath("--classpath"), " "), "outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(), "javaVersion": flags.javaVersion, },