StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2709427

Change-Id: Ib5c271a64158a889d910220fb8cbacbe33c0e0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-31 10:38:44 +00:00
committed by Automerger Merge Worker
parent 2736b2dd44 c09e38de00
commit d148e1f232
1 changed files with 6 additions and 8 deletions
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"). cmd.Flag("--color").
Flag("--quiet"). Flag("--quiet").
Flag("--format=v2").
Flag("--include-annotations"). Flag("--include-annotations").
// The flag makes nullability issues as warnings rather than errors by replacing // The flag makes nullability issues as warnings rather than errors by replacing
// @Nullable/@NonNull in the listed packages APIs with @RecentlyNullable/@RecentlyNonNull, // @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 ", "InvalidNullabilityOverride").
FlagWithArg("--hide ", "ChangedDefault") FlagWithArg("--hide ", "ChangedDefault")
// Force metalava to ignore classes on the classpath when an API file contains missing classes. // The main purpose of the `--api-class-resolution api` option is to force metalava to ignore
// See b/285140653 for more information. // 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") 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 return cmd
} }
@@ -1916,7 +1914,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
FlagWithArg("-C ", stubsDir.String()). FlagWithArg("-C ", stubsDir.String()).
FlagWithArg("-D ", stubsDir.String()) FlagWithArg("-D ", stubsDir.String())
rule.Build("metalava", "metalava merged") rule.Build("metalava", "metalava merged text")
if depApiSrcsStubsJar == nil { if depApiSrcsStubsJar == nil {
var flags javaBuilderFlags var flags javaBuilderFlags