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

2023-08-09 14:35:40 +00:00
parent 69bda98f50 808211e519
commit 18801036c7
3 changed files with 1 additions and 4 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -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").