diff options
| author | Ying Wang <wangying@google.com> | 2014-06-25 18:52:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 18:52:02 +0000 |
| commit | 58f8cf727311b91a5bae272201f6d07c832af392 (patch) | |
| tree | 519e2db7829c8d0c951992be22026d53d149afd9 /core/package_internal.mk | |
| parent | 3ee67afe40a1faf86ac60db3d83f23c21f073e18 (diff) | |
| parent | 904446ce0b3f430ac88ae0c08b9c613721474cd5 (diff) | |
| download | build-58f8cf727311b91a5bae272201f6d07c832af392.zip build-58f8cf727311b91a5bae272201f6d07c832af392.tar.gz build-58f8cf727311b91a5bae272201f6d07c832af392.tar.bz2 | |
am 904446ce: am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '904446ce0b3f430ac88ae0c08b9c613721474cd5':
Support to add JNI of both archs in multilib build.
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 ce9d67d..75def2d 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -344,8 +344,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 |