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

Have pom2mk list all duplicates modules

Browse Source 
For easier debugging if there are multiple duplicates

Bug: 76692459
Test: ./update_current.py -x <build-id>

Change-Id: I3079cb4ed1cfd365d792a7b41c9cdb4e7a1e148f
This commit is contained in:
Jeff Gaston
2018-03-29 14:59:01 -04:00
parent 8f08482957
commit af2191e201
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/pom2mk/pom2mk.go
View File

@@ -360,6 +360,7 @@ The makefile is written to stdout, to be put in the current directory (often as
poms := []*Pom{} poms := []*Pom{}
modules := make(map[string]*Pom) modules := make(map[string]*Pom)
duplicate := false
for _, filename := range filenames { for _, filename := range filenames {
pom, err := parse(filename) pom, err := parse(filename)
if err != nil { if err != nil {
@@ -373,11 +374,15 @@ The makefile is written to stdout, to be put in the current directory (often as
if old, ok := modules[key]; ok { if old, ok := modules[key]; ok {
fmt.Fprintln(os.Stderr, "Module", key, "defined twice:", old.PomFile, pom.PomFile) fmt.Fprintln(os.Stderr, "Module", key, "defined twice:", old.PomFile, pom.PomFile)
duplicate = true
} }
modules[key] = pom modules[key] = pom
} }
} }
if duplicate {
os.Exit(1)
}
for _, pom := range poms { for _, pom := range poms {
pom.FixDeps(modules) pom.FixDeps(modules)