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

Merge "Added duplicates checking when extracting source deps." am: 8596bab0b0

Browse Source 
am: 637fc7e4f7

Change-Id: I97fcf7303e6fa592d34c64d925c8cc3299577a9d
This commit is contained in:
Nan Zhang
2017-04-19 19:57:56 +00:00
committed by android-build-merger
parent a7ac434078 637fc7e4f7
commit 1ece903c90
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/module.go
View File

@@ -754,11 +754,18 @@ var SourceDepTag sourceDependencyTag
// modules listed in srcFiles using ":module" syntax // modules listed in srcFiles using ":module" syntax
func ExtractSourcesDeps(ctx BottomUpMutatorContext, srcFiles []string) { func ExtractSourcesDeps(ctx BottomUpMutatorContext, srcFiles []string) {
var deps []string var deps []string
set := make(map[string]bool)
for _, s := range srcFiles { for _, s := range srcFiles {
if m := SrcIsModule(s); m != "" { if m := SrcIsModule(s); m != "" {
if _, found := set[m]; found {
ctx.ModuleErrorf("found source dependency duplicate: %q!", m)
} else {
set[m] = true
deps = append(deps, m) deps = append(deps, m)
} }
} }
}
ctx.AddDependency(ctx.Module(), SourceDepTag, deps...) ctx.AddDependency(ctx.Module(), SourceDepTag, deps...)
} }