Merge "HideFromMake in apexTransitionMutator
should respect special cases" into main am: c965be6ca2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249488 Change-Id: I4911340085cb4e41229a81875ff27c24c61a04ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -712,7 +712,7 @@ func MutateApexTransition(ctx BaseModuleContext, variation string) {
|
||||
base.ApexProperties.InAnyApex = true
|
||||
base.ApexProperties.DirectlyInAnyApex = inApex == directlyInApex
|
||||
|
||||
if platformVariation && !ctx.Host() && !module.AvailableFor(AvailableToPlatform) {
|
||||
if platformVariation && !ctx.Host() && !module.AvailableFor(AvailableToPlatform) && module.NotAvailableForPlatform() {
|
||||
// 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
|
||||
|
Reference in New Issue
Block a user