Allow module types to force creation of a default APEX variant

Bug: 187910671
Test: m droid
Change-Id: I797d4ab60d15b526744fe6e4df1b55c8b75b0310
This commit is contained in:
Paul Duffin
2021-05-12 16:16:51 +01:00
parent a556647c50
commit b5769c15a3
3 changed files with 19 additions and 3 deletions

View File

@@ -1013,9 +1013,8 @@ func markPlatformAvailability(mctx android.BottomUpMutatorContext) {
}
})
// Exception 1: stub libraries and native bridge libraries are always available to platform
if cc, ok := mctx.Module().(*cc.Module); ok &&
(cc.IsStubs() || cc.Target().NativeBridge == android.NativeBridgeEnabled) {
// Exception 1: check to see if the module always requires it.
if am.AlwaysRequiresPlatformApexVariant() {
availableToPlatform = true
}