summaryrefslogtreecommitdiffstats
path: root/core/package_internal.mk
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-04-17 19:42:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-17 19:42:55 +0000
commitcc39abfdd2ec52669b6646b9ec0e13beb4e92150 (patch)
tree83d17efd07a1dc0fcdb98a1aaa77dfb334a93094 /core/package_internal.mk
parent8f9f7c0672b2fb628e0108088729ffadb0a41092 (diff)
parenta6c44859c5344d489526641ce5a08598254da57b (diff)
downloadbuild-cc39abfdd2ec52669b6646b9ec0e13beb4e92150.zip
build-cc39abfdd2ec52669b6646b9ec0e13beb4e92150.tar.gz
build-cc39abfdd2ec52669b6646b9ec0e13beb4e92150.tar.bz2
am a6c44859: am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit 'a6c44859c5344d489526641ce5a08598254da57b': Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Diffstat (limited to 'core/package_internal.mk')
-rw-r--r--core/package_internal.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk
index ecc2a95..fee484f 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -392,7 +392,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_JNI_SHARED_LIBRARIES_ZIP_OPTIONS := $(LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS)
$(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.