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

Merge "Modify Soong to utilize from-text android.jar in build" am: bc2906efef am: e518bf7c3d am: 5746993043

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

Change-Id: Ibb008c511597b5746bc9c70c9368c4a3fe3322da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-30 17:43:57 +00:00
committed by Automerger Merge Worker
parent 7e6b3d60ac 5746993043
commit ffddc94522
7 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/java.go
View File

@@ -1696,6 +1696,12 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder,
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,
// and these packages are meant to have everything annotated
// @RecentlyNullable/@RecentlyNonNull.
FlagWithArg("--force-convert-to-warning-nullability-annotations ", "+*:-android.*:+android.icu.*:-dalvik.*").
FlagWithArg("--repeat-errors-max ", "10").
FlagWithArg("--hide ", "UnresolvedImport").
FlagWithArg("--hide ", "InvalidNullabilityOverride").
@@ -1704,6 +1710,14 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder,
return cmd
}
func (al *ApiLibrary) HeaderJars() android.Paths {
return android.Paths{al.stubsJar}
}
func (al *ApiLibrary) OutputDirAndDeps() (android.Path, android.Paths) {
return nil, nil
}
func (al *ApiLibrary) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, stubsDir android.OptionalPath) {
if stubsDir.Valid() {
cmd.FlagWithArg("--stubs ", stubsDir.String())
@@ -1815,7 +1829,10 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
ctx.Phony(ctx.ModuleName(), al.stubsJar)
ctx.SetProvider(JavaInfoProvider, JavaInfo{
HeaderJars: android.PathsIfNonNil(al.stubsJar),
HeaderJars: android.PathsIfNonNil(al.stubsJar),
ImplementationAndResourcesJars: android.PathsIfNonNil(al.stubsJar),
ImplementationJars: android.PathsIfNonNil(al.stubsJar),
AidlIncludeDirs: android.Paths{},
})
}