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

Merge "arch-specific dependencies are correctly handled in apex"

Browse Source
This commit is contained in:
Treehugger Robot
2018-10-24 22:53:42 +00:00
committed by Gerrit Code Review
parent 04f42377ba 678529ef29
commit ddfcd42b25
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -113,7 +113,7 @@ func apexDepsMutator(mctx android.TopDownMutatorContext) {
apexBundleName := mctx.Module().Name() apexBundleName := mctx.Module().Name()
mctx.WalkDeps(func(child, parent android.Module) bool { mctx.WalkDeps(func(child, parent android.Module) bool {
if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() { if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() {
moduleName := am.Name() moduleName := am.Name() + "-" + am.Target().String()
bundleNames, ok := apexBundleNamesFor(mctx.Config())[moduleName] bundleNames, ok := apexBundleNamesFor(mctx.Config())[moduleName]
if !ok { if !ok {
bundleNames = make(map[string]bool) bundleNames = make(map[string]bool)
@@ -131,7 +131,7 @@ func apexDepsMutator(mctx android.TopDownMutatorContext) {
// Create apex variations if a module is included in APEX(s). // Create apex variations if a module is included in APEX(s).
func apexMutator(mctx android.BottomUpMutatorContext) { func apexMutator(mctx android.BottomUpMutatorContext) {
if am, ok := mctx.Module().(android.ApexModule); ok && am.CanHaveApexVariants() { if am, ok := mctx.Module().(android.ApexModule); ok && am.CanHaveApexVariants() {
moduleName := am.Name() moduleName := am.Name() + "-" + am.Target().String()
if bundleNames, ok := apexBundleNamesFor(mctx.Config())[moduleName]; ok { if bundleNames, ok := apexBundleNamesFor(mctx.Config())[moduleName]; ok {
variations := []string{"platform"} variations := []string{"platform"}
for bn := range bundleNames { for bn := range bundleNames {