diff options
Diffstat (limited to 'android/apex.go')
| -rw-r--r-- | android/apex.go | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/android/apex.go b/android/apex.go index c2f73a9c1..a5ccd520e 100644 --- a/android/apex.go +++ b/android/apex.go @@ -616,25 +616,26 @@ func MutateApexTransition(ctx BaseModuleContext, variation string) { apexInfos = allApexInfos.ApexInfos } - // Shortcut - if len(apexInfos) == 0 { - return + 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 + module.MakeUninstallable() } // Do some validity checks. // TODO(jiyong): is this the right place? base.checkApexAvailableProperty(ctx) + // Shortcut + if len(apexInfos) == 0 { + return + } + if !module.UniqueApexVariations() && !base.ApexProperties.UniqueApexVariationsForDeps { apexInfos, _ = mergeApexVariations(apexInfos) } - 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 - module.MakeUninstallable() - } if !platformVariation { var thisApexInfo ApexInfo |