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 /androidmk | |
| parent | b1a5e9cadfdd0765f763883fd7410add24486ef6 (diff) | |
| download | build_soong-a4f08813a34418a07aa0ebd8b3e704f3a82081ef.tar.gz build_soong-a4f08813a34418a07aa0ebd8b3e704f3a82081ef.tar.bz2 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 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 1d509805..0cb6dd68 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -140,6 +140,7 @@ func init() { "LOCAL_DX_FLAGS": "dxflags", "LOCAL_JAVA_LIBRARIES": "libs", "LOCAL_STATIC_JAVA_LIBRARIES": "static_libs", + "LOCAL_JNI_SHARED_LIBRARIES": "jni_libs", "LOCAL_AAPT_FLAGS": "aaptflags", "LOCAL_PACKAGE_SPLITS": "package_splits", "LOCAL_COMPATIBILITY_SUITE": "test_suites", |