Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d55db730 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace -bootclasspath and -classpath metalava options with... 

Merge "Replace -bootclasspath and -classpath metalava options with --classpath" into main am: 19e00b35

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



Change-Id: Id49a85ef2f9e7af6da6d283343d96edd1dd68136
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e4815a8 19e00b35

java/droidstubs.go

+6 −6
Original line number Diff line number Diff line
@@ -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").