diff options
| author | Alan Viverette <alanv@google.com> | 2018-03-28 10:32:10 -0400 |
|---|---|---|
| committer | Jeff Gaston <jeffrygaston@google.com> | 2018-04-06 13:20:44 -0400 |
| commit | d95159cb33afbf252084975bf17a44ecaef42840 (patch) | |
| tree | a6d4ba1d8c3b068cea053d07448db7703ecd09c6 | |
| parent | d2cc96c24ad50127b12e9f259c946b3782bf49f7 (diff) | |
| download | build_soong-d95159cb33afbf252084975bf17a44ecaef42840.tar.gz build_soong-d95159cb33afbf252084975bf17a44ecaef42840.tar.bz2 build_soong-d95159cb33afbf252084975bf17a44ecaef42840.zip | |
Always include JAR dependencies (not just with --static-deps) in Makefile
Bug: 76692459
Test: ./update_current.py -x <build-id>
Change-Id: Ie0f77e52089adbe153d668fe39902545f469f2d2
Merged-In: Ie0f77e52089adbe153d668fe39902545f469f2d2
| -rw-r--r-- | cmd/pom2mk/pom2mk.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go index 63bcbb65..bf478961 100644 --- a/cmd/pom2mk/pom2mk.go +++ b/cmd/pom2mk/pom2mk.go @@ -195,9 +195,10 @@ LOCAL_BUILT_MODULE_STEM := javalib.jar 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) `)) |