From 6200d85e2d96d6486cf36e945680b016924fb02a Mon Sep 17 00:00:00 2001 From: Arian Date: Wed, 17 Aug 2022 19:28:53 +0200 Subject: [PATCH] soong: generator: Replace android.SourceDepTag usage with IsSourceDepTagWithOutputTag Change-Id: Iad5d9a07d06a7efda233cc8d3387e8db5c3b0ab5 (cherry picked from commit 994d8647f5519f6ce107de1e98b0f9130ae47aa2) --- build/soong/generator/generator.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/soong/generator/generator.go b/build/soong/generator/generator.go index 9ee0e7a..f772552 100644 --- a/build/soong/generator/generator.go +++ b/build/soong/generator/generator.go @@ -147,8 +147,6 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { if len(g.properties.Tools) > 0 { ctx.VisitDirectDepsBlueprint(func(module blueprint.Module) { switch ctx.OtherModuleDependencyTag(module) { - case android.SourceDepTag: - // Nothing to do case hostToolDepTag: tool := ctx.OtherModuleName(module) var path android.OptionalPath @@ -186,7 +184,9 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { ctx.ModuleErrorf("host tool %q missing output file", tool) } default: - ctx.ModuleErrorf("unknown dependency on %q", ctx.OtherModuleName(module)) + if !android.IsSourceDepTagWithOutputTag(ctx.OtherModuleDependencyTag(module), "") { + ctx.ModuleErrorf("unknown dependency on %q", ctx.OtherModuleName(module)) + } } }) }