diff options
| author | Colin Cross <ccross@android.com> | 2018-10-02 22:03:40 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-10-08 15:20:56 -0700 |
| commit | a4f08813a34418a07aa0ebd8b3e704f3a82081ef (patch) | |
| tree | f1956fe9c05bf91f87f8efd3aafe8daff09e1c67 /java/androidmk.go | |
| parent | b1a5e9cadfdd0765f763883fd7410add24486ef6 (diff) | |
| download | android_build_soong-a4f08813a34418a07aa0ebd8b3e704f3a82081ef.tar.gz android_build_soong-a4f08813a34418a07aa0ebd8b3e704f3a82081ef.tar.bz2 android_build_soong-a4f08813a34418a07aa0ebd8b3e704f3a82081ef.zip | |
Add support for JNI libraries to android_app modules
Make android_app modules a MultiTargets module, which means the
common variant will have a list of Targets that it needs to handle.
Collect JNI libraries for each Target, and package them into or
alongside the APK.
Bug: 80095087
Test: app_test.go
Change-Id: Iabd3921e1d4c4b4cfcc7e131a0b0d9ab83b0ebbb
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 313a144e..7a2fe1e1 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -243,6 +243,10 @@ func (app *AndroidApp) AndroidMk() android.AndroidMkData { if len(app.appProperties.Overrides) > 0 { fmt.Fprintln(w, "LOCAL_OVERRIDES_PACKAGES := "+strings.Join(app.appProperties.Overrides, " ")) } + + for _, jniLib := range app.installJniLibs { + fmt.Fprintln(w, "LOCAL_SOONG_JNI_LIBS_"+jniLib.target.Arch.ArchType.String(), "+=", jniLib.name) + } }, }, } |