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

Merge "pom2mk to include extra-deps as top-level deps too"

Browse Source
This commit is contained in:
Treehugger Robot
2018-04-23 22:06:52 +00:00
committed by Gerrit Code Review
parent 358056c058 358f25e97d
commit 346d43b62e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/pom2mk/pom2mk.go
View File

@@ -160,6 +160,10 @@ func (p Pom) MkAarDeps() []string {
// method are formatted as Make targets, e.g. run through MavenToMk rules. // method are formatted as Make targets, e.g. run through MavenToMk rules.
func (p Pom) MkDeps(typeExt string, scopes []string) []string { func (p Pom) MkDeps(typeExt string, scopes []string) []string {
var ret []string var ret []string
if typeExt == "jar" {
// all top-level extra deps are assumed to be of type "jar" until we add syntax to specify other types
ret = append(ret, extraDeps[p.MkName()]...)
}
for _, d := range p.Dependencies { for _, d := range p.Dependencies {
if d.Type != typeExt || !InList(d.Scope, scopes) { if d.Type != typeExt || !InList(d.Scope, scopes) {
continue continue