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

Merge "Only output make targets for uninstallable static libs in the APEX unavailable-to-platform case." am: 9f381d5ce3 am: 0be556121d

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

Change-Id: Ie961e81a936ff5cd2e60af10bf2c9168334e9789
This commit is contained in:
Martin Stjernholm
2020-08-07 11:49:27 +00:00
committed by Automerger Merge Worker
parent 46781179ef 0be556121d
commit 23b0343a00
7 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/apex.go
View File

@@ -296,7 +296,10 @@ func (m *ApexModuleBase) CreateApexVariations(mctx BottomUpMutatorContext) []Mod
for i, mod := range modules {
platformVariation := i == 0
if platformVariation && !mctx.Host() && !mod.(ApexModule).AvailableFor(AvailableToPlatform) {
mod.SkipInstall()
// Do not install the module for platform, but still allow it to output
// uninstallable AndroidMk entries in certain cases when they have
// side effects.
mod.MakeUninstallable()
}
if !platformVariation {
mod.(ApexModule).apexModuleBase().ApexProperties.Info = m.apexVariations[i-1]