StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I505a7ad8,I92d88199 into main

Browse Source 
* changes:
  Disable source apex variant using apex_available_name
  Skip `contents` validation of source bootclasspath fragments
This commit is contained in:
Treehugger Robot
2024-09-06 06:07:42 +00:00
committed by Gerrit Code Review
parent 4301e29a02 003452ff9c
commit fae5ec8bbc
5 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/dexpreopt.go
View File

@@ -209,13 +209,18 @@ func disableSourceApexVariant(ctx android.BaseModuleContext) bool {
psi = prebuiltSelectionInfo
}
})
// Find the apex variant for this module
var apexVariantsWithoutTestApexes []string
apexVariantsWithoutTestApexes := []string{}
if apexInfo.BaseApexName != "" {
// This is a transitive dependency of an override_apex
apexVariantsWithoutTestApexes = []string{apexInfo.BaseApexName}
apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.BaseApexName)
} else {
_, apexVariantsWithoutTestApexes, _ = android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)
_, variants, _ := android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)
apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, variants...)
}
if apexInfo.ApexAvailableName != "" {
apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.ApexAvailableName)
}
disableSource := false
// find the selected apexes