From 0e446159bcde2ced43e0bd602ae42f6eccb9c625 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 3 May 2021 13:35:32 -0700 Subject: Support blueprint_go_binary in PathForModuleSrc Allow blueprint_go_binary to be used as test data by supporting it in PathForModuleSrc. Also make python use GetDirectDepsWithTag instead of VisitDirectDeps so it doesn't fail on the dependency to a Blueprint (non-Android) module. Fixes: 186528269 Test: manual Change-Id: Ibc1d7caf7bf1fa5db805c3b885a95df4baee0ecf --- python/python.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'python/python.go') diff --git a/python/python.go b/python/python.go index 4444a70e6..0f5b7880e 100644 --- a/python/python.go +++ b/python/python.go @@ -444,11 +444,10 @@ func (p *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { var sharedLibs []string // if embedded launcher is enabled, we need to collect the shared library depenendencies of the // launcher - ctx.VisitDirectDeps(func(dep android.Module) { - if ctx.OtherModuleDependencyTag(dep) == launcherSharedLibTag { - sharedLibs = append(sharedLibs, ctx.OtherModuleName(dep)) - } - }) + for _, dep := range ctx.GetDirectDepsWithTag(launcherSharedLibTag) { + sharedLibs = append(sharedLibs, ctx.OtherModuleName(dep)) + } + p.installer.setAndroidMkSharedLibs(sharedLibs) // Install the par file from installSource -- cgit v1.2.3-59-g8ed1b