diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/dexpreopt.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 5928446e3..44ba80a10 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -211,20 +211,19 @@ func disableSourceApexVariant(ctx android.BaseModuleContext) bool { }) // Find the apex variant for this module - apexVariantsWithoutTestApexes := []string{} + apexVariants := []string{} if apexInfo.BaseApexName != "" { // This is a transitive dependency of an override_apex - apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.BaseApexName) + apexVariants = append(apexVariants, apexInfo.BaseApexName) } else { - _, variants, _ := android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes) - apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, variants...) + apexVariants = append(apexVariants, apexInfo.InApexVariants...) } if apexInfo.ApexAvailableName != "" { - apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.ApexAvailableName) + apexVariants = append(apexVariants, apexInfo.ApexAvailableName) } disableSource := false // find the selected apexes - for _, apexVariant := range apexVariantsWithoutTestApexes { + for _, apexVariant := range apexVariants { if len(psi.GetSelectedModulesForApiDomain(apexVariant)) > 0 { // If the apex_contribution for this api domain is non-empty, disable the source variant disableSource = true |