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

Merge "Handle already existing targets of different name" into main am: 68a3d9b33e am: 07eb212463 am: c85ebf33fe am: 51da529229 am: ee4348d7b3

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

Change-Id: Ibb87b3f1134185e2d78bfc2b5f48b119152b4ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Parsons
2023-09-22 23:33:45 +00:00
committed by Automerger Merge Worker
parent 5ec1bc74af ee4348d7b3
commit 2ca693f6fd
9 changed files with 86 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/config.go
View File

@@ -2026,10 +2026,9 @@ func (c *config) LogMixedBuild(ctx BaseModuleContext, useBazel bool) {
}
}
func (c *config) HasBazelBuildTargetInSource(ctx BaseModuleContext) bool {
moduleName := ctx.Module().Name()
for _, buildTarget := range c.bazelTargetsByDir[ctx.ModuleDir()] {
if moduleName == buildTarget {
func (c *config) HasBazelBuildTargetInSource(dir string, target string) bool {
for _, existingTarget := range c.bazelTargetsByDir[dir] {
if target == existingTarget {
return true
}
}