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

Commit f8aaaa13 authored by Paul Duffin's avatar Paul Duffin
Browse files

Replace -bootclasspath and -classpath metalava options with --classpath 

Metalava has not differentiated between bootclasspath and classpath for
years so this change replaces the use of the two deprecated single
hyphen options with `--classpath`.

Bug: 295136054
Test: m checkapi
Change-Id: I3ab20b76a60cab66a27784b7d87a069813d19835
parent 4fa1bfe1

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").