diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-17 19:20:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-17 19:20:25 +0000 |
| commit | a6c44859c5344d489526641ce5a08598254da57b (patch) | |
| tree | 7c4549986a06941aa00c823ef52563357b105dc8 | |
| parent | c4d303e958e1f3475fd1070bdb307b4f675f3bdd (diff) | |
| parent | bc671bc65ee8db4ba0bba33543d41d372f424f9d (diff) | |
| download | build-a6c44859c5344d489526641ce5a08598254da57b.zip build-a6c44859c5344d489526641ce5a08598254da57b.tar.gz build-a6c44859c5344d489526641ce5a08598254da57b.tar.bz2 | |
am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit 'bc671bc65ee8db4ba0bba33543d41d372f424f9d':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 5 | ||||
| -rw-r--r-- | core/package_internal.mk | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 0ff8ceb..9975fa1 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -96,7 +96,6 @@ LOCAL_COMPRESS_MODULE_SYMBOLS:= LOCAL_STRIP_MODULE:= LOCAL_JNI_SHARED_LIBRARIES:= LOCAL_JNI_SHARED_LIBRARIES_ABI:= -LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS:= LOCAL_PREBUILT_JNI_LIBS:= LOCAL_JAR_MANIFEST:= LOCAL_INSTRUMENTATION_FOR:= diff --git a/core/definitions.mk b/core/definitions.mk index 4f0daae..6114395 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1903,7 +1903,8 @@ $(hide) mkdir -p $(addprefix $(dir $@)lib/,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI)) $(foreach abi,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI),\ $(call _add-jni-shared-libs-to-package-per-abi,$(abi),\ $(patsubst $(abi):%,%,$(filter $(abi):%,$(PRIVATE_JNI_SHARED_LIBRARIES))))) -$(hide) (cd $(dir $@) && zip -r $(PRIVATE_JNI_SHARED_LIBRARIES_ZIP_OPTIONS) $(notdir $@) lib) +$(hide) (cd $(dir $@) && zip -r \ + $(if $(filter true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-0,) $(notdir $@) lib) $(hide) rm -rf $(dir $@)lib endef @@ -1937,7 +1938,7 @@ define align-package $(hide) mv $@ $@.unaligned $(hide) $(ZIPALIGN) \ -f \ - $(if $(findstring true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-p ,) \ + $(if $(filter true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-p,) \ 4 \ $@.unaligned $@.aligned $(hide) mv $@.aligned $@ diff --git a/core/package_internal.mk b/core/package_internal.mk index 016e23f..d52997b 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -369,7 +369,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. |