Merge "Added duplicates checking when extracting source deps." am: 8596bab0b0
am: 637fc7e4f7
Change-Id: I97fcf7303e6fa592d34c64d925c8cc3299577a9d
This commit is contained in:
@@ -754,9 +754,16 @@ 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 != "" {
|
||||||
deps = append(deps, m)
|
if _, found := set[m]; found {
|
||||||
|
ctx.ModuleErrorf("found source dependency duplicate: %q!", m)
|
||||||
|
} else {
|
||||||
|
set[m] = true
|
||||||
|
deps = append(deps, m)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user