diff options
Diffstat (limited to 'android/apex.go')
| -rw-r--r-- | android/apex.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/android/apex.go b/android/apex.go index a4b695608..9195388bf 100644 --- a/android/apex.go +++ b/android/apex.go @@ -180,20 +180,20 @@ func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) { func (m *ApexModuleBase) CreateApexVariations(mctx BottomUpMutatorContext) []Module { if len(m.apexVariations) > 0 { m.checkApexAvailableProperty(mctx) + sort.Strings(m.apexVariations) variations := []string{} - availableForPlatform := mctx.Module().(ApexModule).AvailableFor(AvailableToPlatform) || mctx.Host() - if availableForPlatform { - variations = append(variations, "") // Original variation for platform - } + variations = append(variations, "") // Original variation for platform variations = append(variations, m.apexVariations...) defaultVariation := "" mctx.SetDefaultDependencyVariation(&defaultVariation) + modules := mctx.CreateVariations(variations...) for i, m := range modules { - if availableForPlatform && i == 0 { - continue + platformVariation := i == 0 + if platformVariation && !mctx.Host() && !m.(ApexModule).AvailableFor(AvailableToPlatform) { + m.SkipInstall() } m.(ApexModule).setApexName(variations[i]) } |