StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace -bootclasspath and -classpath metalava options with --classpath" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-10 17:12:16 +00:00
committed by Gerrit Code Review
parent 1988ccf5bf f8aaaa13f4
commit 19e00b350a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/droidstubs.go
View File

@@ -516,12 +516,12 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
FlagWithRspFileInputList("@", android.PathForModuleOut(ctx, "metalava.rsp"), srcs). FlagWithRspFileInputList("@", android.PathForModuleOut(ctx, "metalava.rsp"), srcs).
FlagWithInput("@", srcJarList) FlagWithInput("@", srcJarList)
if len(bootclasspath) > 0 { // Metalava does not differentiate between bootclasspath and classpath and has not done so for
cmd.FlagWithInputList("-bootclasspath ", bootclasspath.Paths(), ":") // years, so it is unlikely to change any time soon.
} combinedPaths := append(([]android.Path)(nil), bootclasspath.Paths()...)
combinedPaths = append(combinedPaths, classpath.Paths()...)
if len(classpath) > 0 { if len(combinedPaths) > 0 {
cmd.FlagWithInputList("-classpath ", classpath.Paths(), ":") cmd.FlagWithInputList("--classpath ", combinedPaths, ":")
} }
cmd.Flag("--color"). cmd.Flag("--color").