diff options
| author | Ying Wang <wangying@google.com> | 2014-06-24 20:01:52 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-25 09:07:01 -0700 |
| commit | 8e20ef6205b3c96135b1c1e4484d523dbecb1b98 (patch) | |
| tree | 506b1e36c6460dba960e092d3414d3a65b4f17f9 /core/package_internal.mk | |
| parent | b0c6ea9f290261c12b6cb127b7bcd53f8ecc2d60 (diff) | |
| download | build-8e20ef6205b3c96135b1c1e4484d523dbecb1b98.zip build-8e20ef6205b3c96135b1c1e4484d523dbecb1b98.tar.gz build-8e20ef6205b3c96135b1c1e4484d523dbecb1b98.tar.bz2 | |
Support to add JNI of both archs in multilib build.
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.
Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 5285616..d97ce2a 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -336,8 +336,10 @@ $(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\ # Define the rule to build the actual package. $(LOCAL_BUILT_MODULE): $(AAPT) | $(ZIPALIGN) -$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries) -$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abi) +# PRIVATE_JNI_SHARED_LIBRARIES is a list of <abi>:<path_of_built_lib>. +$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis) +# PRIVATE_JNI_SHARED_LIBRARIES_ABI is a list of ABI names. +$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis) ifneq ($(TARGET_BUILD_APPS),) # Include all resources for unbundled apps. LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true |