diff options
author | Jeff Gaston <jeffrygaston@google.com> | 2018-03-29 14:58:50 -0400 |
---|---|---|
committer | Jeff Gaston <jeffrygaston@google.com> | 2018-04-09 12:44:07 -0400 |
commit | 15a7f831046d5c277ad8159f4452210ad9f0caa5 (patch) | |
tree | 76bf495bd182170dd02834405a807ca31b78d8cd /cmd | |
parent | d95159cb33afbf252084975bf17a44ecaef42840 (diff) | |
download | build_soong-15a7f831046d5c277ad8159f4452210ad9f0caa5.tar.gz build_soong-15a7f831046d5c277ad8159f4452210ad9f0caa5.tar.bz2 build_soong-15a7f831046d5c277ad8159f4452210ad9f0caa5.zip |
Have pom2mk include runtime deps too
It still excludes test deps though
Bug: 76692459
Test: ./update_current.py -x <build-id>
Change-Id: I55a786e9feab31f99b95b7cebe84869757e46270
Merged-In: I55a786e9feab31f99b95b7cebe84869757e46270
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/pom2mk/pom2mk.go | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go index bf478961..d45067fc 100644 --- a/cmd/pom2mk/pom2mk.go +++ b/cmd/pom2mk/pom2mk.go @@ -89,6 +89,16 @@ var sdkVersion string var useVersion string var staticDeps bool +func InList(s string, list []string) bool { + for _, l := range list { + if l == s { + return true + } + } + + return false +} + type Dependency struct { XMLName xml.Name `xml:"dependency"` @@ -139,19 +149,19 @@ func (p Pom) MkName() string { } func (p Pom) MkJarDeps() []string { - return p.MkDeps("jar", "compile") + return p.MkDeps("jar", []string{"compile", "runtime"}) } func (p Pom) MkAarDeps() []string { - return p.MkDeps("aar", "compile") + return p.MkDeps("aar", []string{"compile", "runtime"}) } // MkDeps obtains dependencies filtered by type and scope. The results of this // method are formatted as Make targets, e.g. run through MavenToMk rules. -func (p Pom) MkDeps(typeExt string, scope string) []string { +func (p Pom) MkDeps(typeExt string, scopes []string) []string { var ret []string for _, d := range p.Dependencies { - if d.Type != typeExt || d.Scope != scope { + if d.Type != typeExt || !InList(d.Scope, scopes) { continue } name := rewriteNames.MavenToMk(d.GroupId, d.ArtifactId) @@ -363,7 +373,6 @@ The makefile is written to stdout, to be put in the current directory (often as if old, ok := modules[key]; ok { fmt.Fprintln(os.Stderr, "Module", key, "defined twice:", old.PomFile, pom.PomFile) - os.Exit(1) } modules[key] = pom |