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 am: 19e00b350a am: d55db730fa am: 3f83296cd6 am: 5d2c8373f0 am: 68d483241f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2703433

Change-Id: I50d3c1d91048fdcc0df57c7786176313cbb9407f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-10 22:34:32 +00:00
committed by Automerger Merge Worker
parent a97d16bff6 68d483241f
commit e9f33e5975
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").