Merge "HideFromMake in apexTransitionMutator
should respect special cases" into main
This commit is contained in:
@@ -712,7 +712,7 @@ func MutateApexTransition(ctx BaseModuleContext, variation string) {
|
|||||||
base.ApexProperties.InAnyApex = true
|
base.ApexProperties.InAnyApex = true
|
||||||
base.ApexProperties.DirectlyInAnyApex = inApex == directlyInApex
|
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
|
// Do not install the module for platform, but still allow it to output
|
||||||
// uninstallable AndroidMk entries in certain cases when they have side
|
// uninstallable AndroidMk entries in certain cases when they have side
|
||||||
// effects. TODO(jiyong): move this routine to somewhere else
|
// effects. TODO(jiyong): move this routine to somewhere else
|
||||||
|
Reference in New Issue
Block a user