commit 18801036c7136742cf35d6ecc1bda97c3cd7dfa4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 09 14:35:40 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 09 14:35:40 2023 +0000
tree 862e3321640a7f2c7f3189df0512cb65f31600ca
parent 69bda98f506e2c585d43e74d374ea09892db4218
parent 808211e519ae43517ae7d6ed5348ffb1e3b63c45

Merge "Stop using single-hyphen metalava options" into main

java/droiddoc.go

diff --git a/java/droiddoc.go b/java/droiddoc.go
index d4ead12..3ba3065 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -699,7 +699,6 @@
 	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

diff --git a/java/droidstubs.go b/java/droidstubs.go
index bb2388f..77b5658 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -512,8 +512,7 @@
 	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

diff --git a/java/java.go b/java/java.go
index f11debf..0d39a6a 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1726,7 +1726,6 @@
 	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").