Merge "HideFromMake in apexTransitionMutator should respect special cases" into main am: c965be6ca2 am: ed93a620c6

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

Change-Id: I543449187d32658ceb6ae30324825358e9d1cd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2024-09-03 16:49:29 +00:00
committed by Automerger Merge Worker

View File

@@ -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