From bafb897de74f85cbea6b3749b23491d0c0863580 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 6 Jun 2018 21:46:32 +0000 Subject: Revert "Revert "Remove desugar support"" This reverts commit 7576916efcc5e73d3b5e6437187697a451dd43f0. Reason for revert: includes art veridex fix this time Change-Id: Ia8da00b5ec8ed3dc3ce2a2521f0a7b2b2b131960 --- java/builder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/builder.go') diff --git a/java/builder.go b/java/builder.go index d36e0dc0f..d338623dc 100644 --- a/java/builder.go +++ b/java/builder.go @@ -243,7 +243,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. // ensure java does not fall back to the default bootclasspath. bootClasspath = `--bootclasspath ""` } else { - bootClasspath = strings.Join(flags.bootClasspath.FormDesugarClasspath("--bootclasspath"), " ") + bootClasspath = strings.Join(flags.bootClasspath.FormTurbineClasspath("--bootclasspath"), " ") } ctx.Build(pctx, android.BuildParams{ @@ -256,7 +256,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. "javacFlags": flags.javacFlags, "bootClasspath": bootClasspath, "srcJars": strings.Join(srcJars.Strings(), " "), - "classpath": strings.Join(flags.classpath.FormDesugarClasspath("--classpath"), " "), + "classpath": strings.Join(flags.classpath.FormTurbineClasspath("--classpath"), " "), "outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(), "javaVersion": flags.javaVersion, }, @@ -419,7 +419,7 @@ func (x *classpath) FormJavaSystemModulesPath(optName string, forceEmpty bool) s } } -func (x *classpath) FormDesugarClasspath(optName string) []string { +func (x *classpath) FormTurbineClasspath(optName string) []string { if x == nil || *x == nil { return nil } -- cgit v1.2.3-59-g8ed1b