diff options
| author | Ying Wang <wangying@google.com> | 2015-05-04 18:39:46 +0000 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-05-04 18:39:46 +0000 |
| commit | 97dfa3177d9594f9691424052b2a85befeb0b3d8 (patch) | |
| tree | 9b0a13a8af49246afaab9a307bfa307b883a7d9e /core/package_internal.mk | |
| parent | 3797466fbd31cc3ca5a1eddea64e7fdf0921ea67 (diff) | |
| download | build-97dfa3177d9594f9691424052b2a85befeb0b3d8.zip build-97dfa3177d9594f9691424052b2a85befeb0b3d8.tar.gz build-97dfa3177d9594f9691424052b2a85befeb0b3d8.tar.bz2 | |
Revert "Don't extract jni from prebuilt apks."
This reverts commit 3797466fbd31cc3ca5a1eddea64e7fdf0921ea67.
Bug: 20810492
Bug: 20811499
Change-Id: Ic922d9daccc4550db489c0f3d4ad6b4ff85b5e60
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 23648c1..fee484f 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -392,6 +392,7 @@ $(LOCAL_BUILT_MODULE): $(AAPT) | $(ZIPALIGN) $(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) +$(LOCAL_BUILT_MODULE): PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES) ifneq ($(TARGET_BUILD_APPS),) # Include all resources for unbundled apps. LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true |