diff options
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 6 |
1 files changed, 3 insertions, 3 deletions
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 } |