tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "pom2mk to include extra-deps as top-level deps too" am: 346d43b62e

Browse source 
am: 0922ff6891

Change-Id: I1cf81a2b0f3b2cdfa3348f97ced29fcd56bff800
This commit is contained in:
Jeff Gaston 2018-04-23 15:20:34 -07:00 committed by android-build-merger
commit 5dbe9868be
1 changed files with 4 additions and 0 deletions
Show stats 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.
func (p Pom) MkDeps(typeExt string, scopes []string) []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 {
if d.Type != typeExt || !InList(d.Scope, scopes) {
continue