Revert "Revert "Remove desugar support""
This reverts commit 7576916efcc5e73d3b5e6437187697a451dd43f0.
Reason for revert: includes art veridex fix this time
Change-Id: Ia8da00b5ec8ed3dc3ce2a2521f0a7b2b2b131960
diff --git a/java/builder.go b/java/builder.go
index d36e0dc..d338623 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -243,7 +243,7 @@
// 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 @@
"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) FormDesugarClasspath(optName string) []string {
+func (x *classpath) FormTurbineClasspath(optName string) []string {
if x == nil || *x == nil {
return nil
}