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

Merge "Reverse order of tag and android module checks" am: 91ee673ccd am: 442ed3f1d5 am: d017eb755a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1959619

Change-Id: Idb533a884d4458841cb15a2da8c356a07e9ca79a
This commit is contained in:
Liz Kammer
2022-01-26 19:36:19 +00:00
committed by Automerger Merge Worker
parent 66c73ffe6d d017eb755a
commit b237576331
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/module.go
View File

@@ -2620,7 +2620,7 @@ func (b *baseModuleContext) validateAndroidModule(module blueprint.Module, tag b
} }
if aModule == nil { if aModule == nil {
b.ModuleErrorf("module %q not an android module", b.OtherModuleName(module)) b.ModuleErrorf("module %q (%#v) not an android module", b.OtherModuleName(module), tag)
return nil return nil
} }
@@ -2742,8 +2742,8 @@ func (b *baseModuleContext) VisitDirectDeps(visit func(Module)) {
func (b *baseModuleContext) VisitDirectDepsWithTag(tag blueprint.DependencyTag, visit func(Module)) { func (b *baseModuleContext) VisitDirectDepsWithTag(tag blueprint.DependencyTag, visit func(Module)) {
b.bp.VisitDirectDeps(func(module blueprint.Module) { b.bp.VisitDirectDeps(func(module blueprint.Module) {
if aModule := b.validateAndroidModule(module, b.bp.OtherModuleDependencyTag(module), b.strictVisitDeps); aModule != nil { if b.bp.OtherModuleDependencyTag(module) == tag {
if b.bp.OtherModuleDependencyTag(aModule) == tag { if aModule := b.validateAndroidModule(module, b.bp.OtherModuleDependencyTag(module), b.strictVisitDeps); aModule != nil {
visit(aModule) visit(aModule)
} }
} }