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

Merge "Revert "Export non-apex variants of modules to make"" am: 54fb18d43b am: aebbc670a6 am: 18fed433ff

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

Change-Id: I4daebc840cadd17d66a48886b59e3fe3f8fec05c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2023-03-20 12:53:50 +00:00
committed by Automerger Merge Worker
parent 5a8514a3be 18fed433ff
commit 554eaf913c
9 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/apex.go
View File

@@ -605,7 +605,7 @@ func CreateApexVariations(mctx BottomUpMutatorContext, module ApexModule) []Modu
// Do not install the module for platform, but still allow it to output
// uninstallable AndroidMk entries in certain cases when they have side
// effects. TODO(jiyong): move this routine to somewhere else
mod.SkipInstall()
mod.MakeUninstallable()
}
if !platformVariation {
mctx.SetVariationProvider(mod, ApexInfoProvider, apexInfos[i-1])