diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-09-07 15:10:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-09-07 15:10:39 +0000 |
| commit | a4158239a54dbbec2c958a14b53e53a13d9c01f3 (patch) | |
| tree | 7df2fec6641720d6d7606155e98e92bdf79eb787 | |
| parent | cba810e0ac80f5c32f5974f1ec4f043b3b0ab54e (diff) | |
| parent | a6d2ecd2ff31f2ae6e775a0e2ed437c7968e3e09 (diff) | |
| download | soong-a4158239a54dbbec2c958a14b53e53a13d9c01f3.tar.gz | |
Merge changes I3ab20b76,I08e69319 into udc-mainline-prod
* changes:
Replace -bootclasspath and -classpath metalava options with --classpath
Stop using single-hyphen metalava options
| -rw-r--r-- | java/droiddoc.go | 1 | ||||
| -rw-r--r-- | java/droidstubs.go | 15 | ||||
| -rw-r--r-- | java/java.go | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index dbe021d00..1f9f773a3 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -694,7 +694,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) diff --git a/java/droidstubs.go b/java/droidstubs.go index 151c94a43..9379b88aa 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -512,17 +512,16 @@ 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) - 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("--no-banner"). diff --git a/java/java.go b/java/java.go index 75c0a5c4b..5e640bc97 100644 --- a/java/java.go +++ b/java/java.go @@ -1705,7 +1705,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("--no-banner"). |