From 2439eb7761332e90669573a67c2c072855bf378d Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Mon, 10 Apr 2017 11:27:50 -0700 Subject: [PATCH] Added duplicates checking when extracting source deps. Added this functionality since Blueprint layer won't check deps duplicates. Test: Manual m -j. Change-Id: I28d5f558a211609ecd0b4c2223be897fc1baae17 --- android/module.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/android/module.go b/android/module.go index 963d611cd..2b93d8ea4 100644 --- a/android/module.go +++ b/android/module.go @@ -754,9 +754,16 @@ var SourceDepTag sourceDependencyTag // modules listed in srcFiles using ":module" syntax func ExtractSourcesDeps(ctx BottomUpMutatorContext, srcFiles []string) { var deps []string + set := make(map[string]bool) + for _, s := range srcFiles { 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) + } } }