openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove hack for platform availability of modules with missing apexes"

This commit is contained in:
Colin Cross 2020-08-31 04:20:18 +00:00 committed by Gerrit Code Review
parent a0254b5289 d2c81a7933
commit 9c35c9ae63
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apex/apex.go
View File

@ -750,18 +750,6 @@ func markPlatformAvailability(mctx android.BottomUpMutatorContext) {
if am, ok := mctx.Module().(android.ApexModule); ok { if am, ok := mctx.Module().(android.ApexModule); ok {
availableToPlatform := am.AvailableFor(android.AvailableToPlatform) availableToPlatform := am.AvailableFor(android.AvailableToPlatform)
// In a rare case when a lib is marked as available only to an apex
// but the apex doesn't exist. This can happen in a partial manifest branch
// like master-art. Currently, libstatssocket in the stats APEX is causing
// this problem.
// Include the lib in platform because the module SDK that ought to provide
// it doesn't exist, so it would otherwise be left out completely.
// TODO(b/154888298) remove this by adding those libraries in module SDKS and skipping
// this check for libraries provided by SDKs.
if !availableToPlatform && !android.InAnyApex(am.Name()) {
availableToPlatform = true
}
// If any of the dep is not available to platform, this module is also considered // If any of the dep is not available to platform, this module is also considered
// as being not available to platform even if it has "//apex_available:platform" // as being not available to platform even if it has "//apex_available:platform"
mctx.VisitDirectDeps(func(child android.Module) { mctx.VisitDirectDeps(func(child android.Module) {