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

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

Browse Source 
Bug: 76692459
Test: ./update_current.py -x <build-id>
Change-Id: Ie0f77e52089adbe153d668fe39902545f469f2d2
Merged-In: Ie0f77e52089adbe153d668fe39902545f469f2d2
This commit is contained in:
Alan Viverette
2018-03-28 10:32:10 -04:00
committed by Jeff Gaston
parent d2cc96c24a
commit d95159cb33
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/pom2mk/pom2mk.go
View File

@@ -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)
`))