diff options
| author | Ying Wang <wangying@google.com> | 2014-04-17 13:38:04 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-04-18 16:36:19 -0700 |
| commit | 695e826a0cc1da05a0d7bedf73c031cb8ead97c0 (patch) | |
| tree | 2a7de9f5328305fd76a17d8dad82ed82019a2abb /core/prebuilt_internal.mk | |
| parent | 67c209281ff0454213bc117691214bc67ad5a7f2 (diff) | |
| download | build-695e826a0cc1da05a0d7bedf73c031cb8ead97c0.zip build-695e826a0cc1da05a0d7bedf73c031cb8ead97c0.tar.gz build-695e826a0cc1da05a0d7bedf73c031cb8ead97c0.tar.bz2 | |
Update rules to install JNI libraries.
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.
The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
installed to system partitions, we'll embed the jni libs in the
built apk.
- Otherwise, the jni libraries will be installed to the system
lib path, and symlinks created in the app specific lib path.
Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 51440c4..8efb89e 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -107,6 +107,9 @@ endif # LOCAL_STRIP_MODULE not true PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) +rs_compatibility_jni_libs := +include $(BUILD_SYSTEM)/install_jni_libs.mk + ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) # The magic string "EXTERNAL" means this package will be signed with # the default dev key throughout the build process, but we expect |