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

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

Merge "Stop using single-hyphen metalava options" into main am: 18801036 

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



Change-Id: I79ebfcc8967bf23103fca18a49a75ce6ad32a231
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cef5d58 18801036

java/droiddoc.go

+0 −1
Original line number Diff line number Diff line
@@ -699,7 +699,6 @@ func javadocCmd(ctx android.ModuleContext, rule *android.RuleBuilder, srcs andro 
	cmd := rule.Command().

		BuiltTool("soong_javac_wrapper").Tool(config.JavadocCmd(ctx)).

		Flag(config.JavacVmFlags).

		FlagWithArg("-encoding ", "UTF-8").

		FlagWithRspFileInputList("@", android.PathForModuleOut(ctx, "javadoc.rsp"), srcs).

		FlagWithInput("@", srcJarList)

java/droidstubs.go

+1 −2
Original line number Diff line number Diff line
@@ -512,8 +512,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi 
	cmd.BuiltTool("metalava").ImplicitTool(ctx.Config().HostJavaToolPath(ctx, "metalava.jar")).

		Flag(config.JavacVmFlags).

		Flag("-J--add-opens=java.base/java.util=ALL-UNNAMED").

		FlagWithArg("-encoding ", "UTF-8").

		FlagWithArg("-source ", javaVersion.String()).

		FlagWithArg("--java-source ", javaVersion.String()).

		FlagWithRspFileInputList("@", android.PathForModuleOut(ctx, "metalava.rsp"), srcs).

		FlagWithInput("@", srcJarList)

java/java.go

+0 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,6 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder, 
	cmd.BuiltTool("metalava").ImplicitTool(ctx.Config().HostJavaToolPath(ctx, "metalava.jar")).

		Flag(config.JavacVmFlags).

		Flag("-J--add-opens=java.base/java.util=ALL-UNNAMED").

		FlagWithArg("-encoding ", "UTF-8").

		FlagWithInputList("--source-files ", srcs, " ")



	cmd.Flag("--color").