am 9c836723: am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev

* commit '9c836723b784a344442d4646fc849470b8fcd515':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
This commit is contained in:
Dimitry Ivanov
2015-06-04 20:33:25 +00:00
committed by Android Git Automerger
6 changed files with 35 additions and 53 deletions

View File

@@ -438,7 +438,6 @@ $(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