diff options
| -rw-r--r-- | java/droidstubs.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go index 77b56583a..51d36e432 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -516,12 +516,12 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi FlagWithRspFileInputList("@", android.PathForModuleOut(ctx, "metalava.rsp"), srcs). FlagWithInput("@", srcJarList) - if len(bootclasspath) > 0 { - cmd.FlagWithInputList("-bootclasspath ", bootclasspath.Paths(), ":") - } - - if len(classpath) > 0 { - cmd.FlagWithInputList("-classpath ", classpath.Paths(), ":") + // Metalava does not differentiate between bootclasspath and classpath and has not done so for + // years, so it is unlikely to change any time soon. + combinedPaths := append(([]android.Path)(nil), bootclasspath.Paths()...) + combinedPaths = append(combinedPaths, classpath.Paths()...) + if len(combinedPaths) > 0 { + cmd.FlagWithInputList("--classpath ", combinedPaths, ":") } cmd.Flag("--color"). |