Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5514698b authored by Liz Kammer's avatar Liz Kammer
Browse files

Reverse order of tag and android module checks 

Currently, this checks validates a module then checks the tag for all
modules. However, we don't need to validate modules where the tag does
not apply.

Test: m nothing and compare ninja/mk files
Change-Id: I6298c9dc8aa37ffac74202bea59f4090fff90e4e
parent 539d41b6

android/module.go

+3 −3
Original line number Diff line number Diff line
@@ -2620,7 +2620,7 @@ func (b *baseModuleContext) validateAndroidModule(module blueprint.Module, tag b 
	}



	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

	}
@@ -2742,8 +2742,8 @@ func (b *baseModuleContext) VisitDirectDeps(visit func(Module)) { 


func (b *baseModuleContext) VisitDirectDepsWithTag(tag blueprint.DependencyTag, visit func(Module)) {

	b.bp.VisitDirectDeps(func(module blueprint.Module) {

		if b.bp.OtherModuleDependencyTag(module) == tag {

			if aModule := b.validateAndroidModule(module, b.bp.OtherModuleDependencyTag(module), b.strictVisitDeps); aModule != nil {

			if b.bp.OtherModuleDependencyTag(aModule) == tag {

				visit(aModule)

			}

		}