From 336b16a32524546ec871455c3eada74ad4c446d2 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 15 Aug 2023 23:10:13 +0100 Subject: [PATCH] Remove unnecessary options when generating stubs from signatures These options are unnecessary because: * `--format` and `--api-overloaded-method-order` only affects the generation of signature files which this does not do. Also changed the build rule description to differentiate from the usual metalava command to make it easier to find in the ninja file. Bug: 296115567 Test: m --build-from-text-stub Change-Id: I7986cba00c364282ddc436d2e69bfb66eda46436 --- java/java.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/java/java.go b/java/java.go index 4b01c316d..d2350194b 100644 --- a/java/java.go +++ b/java/java.go @@ -1735,7 +1735,6 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder, cmd.Flag("--color"). Flag("--quiet"). - Flag("--format=v2"). Flag("--include-annotations"). // The flag makes nullability issues as warnings rather than errors by replacing // @Nullable/@NonNull in the listed packages APIs with @RecentlyNullable/@RecentlyNonNull, @@ -1747,14 +1746,13 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder, FlagWithArg("--hide ", "InvalidNullabilityOverride"). FlagWithArg("--hide ", "ChangedDefault") - // Force metalava to ignore classes on the classpath when an API file contains missing classes. - // See b/285140653 for more information. + // The main purpose of the `--api-class-resolution api` option is to force metalava to ignore + // classes on the classpath when an API file contains missing classes. However, as this command + // does not specify `--classpath` this is not needed for that. However, this is also used as a + // signal to the special metalava code for generating stubs from text files that it needs to add + // some additional items into the API (e.g. default constructors). cmd.FlagWithArg("--api-class-resolution ", "api") - // Force metalava to sort overloaded methods by their order in the source code. - // See b/285312164 for more information. - cmd.FlagWithArg("--api-overloaded-method-order ", "source") - return cmd } @@ -1916,7 +1914,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { FlagWithArg("-C ", stubsDir.String()). FlagWithArg("-D ", stubsDir.String()) - rule.Build("metalava", "metalava merged") + rule.Build("metalava", "metalava merged text") if depApiSrcsStubsJar == nil { var flags javaBuilderFlags