commit 2b53a0c4b89397f853fc0479340ee09b1f29cc18
author Alan Viverette <alanv@google.com> Wed Mar 28 10:32:10 2018 -0400
committer Alan Viverette <alanv@google.com> Wed Mar 28 14:32:10 2018 -0400
tree 3e005cd67c793e6ff91573a19a566fcd2dd7a5bb
parent e42777a05a1f4bdde22b0dce03f3361e52e2dbae

Always include JAR dependencies (not just with --static-deps) in Makefile

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

cmd/pom2mk/pom2mk.go

diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go
index 63bcbb6..bf47896 100644
--- a/cmd/pom2mk/pom2mk.go
+++ b/cmd/pom2mk/pom2mk.go
@@ -195,9 +195,10 @@
 LOCAL_MODULE_SUFFIX := .{{.Packaging}}
 LOCAL_USE_AAPT2 := true
 LOCAL_SDK_VERSION := {{.SdkVersion}}
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-{{range .MkAarDeps}}  {{.}} \
-{{end}}
+LOCAL_STATIC_JAVA_LIBRARIES :={{range .MkJarDeps}} \
+  {{.}}{{end}}
+LOCAL_STATIC_ANDROID_LIBRARIES :={{range .MkAarDeps}} \
+  {{.}}{{end}}
 include $(BUILD_PREBUILT)
 `))