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

Merge "Restrict verify_overlaps to pre S modules" into main am: 2dc86ebd3e am: 59bb373c64

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

Change-Id: I600d9363357424da25fca6c9280edc593144225b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2024-02-13 14:39:56 +00:00
committed by Automerger Merge Worker
parent dbe2df9062 59bb373c64
commit d6c41d2f7e
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/hiddenapi_monolithic.go
View File

@@ -68,7 +68,7 @@ func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory F
case *ClasspathFragmentElement:
fragment := e.Module()
if info, ok := android.OtherModuleProvider(ctx, fragment, HiddenAPIInfoProvider); ok {
monolithicInfo.append(&info)
monolithicInfo.append(ctx, fragment, &info)
} else {
ctx.ModuleErrorf("%s does not provide hidden API information", fragment)
}
@@ -79,14 +79,25 @@ func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory F
}
// append appends all the files from the supplied info to the corresponding files in this struct.
func (i *MonolithicHiddenAPIInfo) append(other *HiddenAPIInfo) {
func (i *MonolithicHiddenAPIInfo) append(ctx android.ModuleContext, otherModule android.Module, other *HiddenAPIInfo) {
i.FlagsFilesByCategory.append(other.FlagFilesByCategory)
i.AnnotationFlagsPaths = append(i.AnnotationFlagsPaths, other.AnnotationFlagsPath)
i.MetadataPaths = append(i.MetadataPaths, other.MetadataPath)
i.IndexPaths = append(i.IndexPaths, other.IndexPath)
i.StubFlagSubsets = append(i.StubFlagSubsets, other.StubFlagSubset())
i.FlagSubsets = append(i.FlagSubsets, other.FlagSubset())
apexInfo, ok := android.OtherModuleProvider(ctx, otherModule, android.ApexInfoProvider)
if !ok {
ctx.ModuleErrorf("Could not determine min_version_version of %s\n", otherModule.Name())
return
}
if apexInfo.MinSdkVersion.LessThanOrEqualTo(android.ApiLevelR) {
// Restrict verify_overlaps to R and older modules.
// The runtime in S does not have the same restriction that
// requires the hiddenapi flags to be generated in a monolithic
// invocation.
i.StubFlagSubsets = append(i.StubFlagSubsets, other.StubFlagSubset())
i.FlagSubsets = append(i.FlagSubsets, other.FlagSubset())
}
}
var MonolithicHiddenAPIInfoProvider = blueprint.NewProvider[MonolithicHiddenAPIInfo]()