tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove unnecessary options when generating stubs from signatures" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-08-31 09:45:30 +00:00 committed by Gerrit Code Review
commit c09e38de00
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
java/java.go
View file

@ -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