diff options
| author | Ying Wang <wangying@google.com> | 2015-07-16 19:01:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-16 19:01:55 +0000 |
| commit | e421b10f1c50aa11bd4ca299537c16bac0263da8 (patch) | |
| tree | 080946f528f271e7699911befd6a30c8f7756326 /core | |
| parent | 54152d3062b436a0bb060544f1311d124c81bdbe (diff) | |
| parent | e8ecab8d099f465d527f7bc0fbd04f26ac477a93 (diff) | |
| download | build-e421b10f1c50aa11bd4ca299537c16bac0263da8.zip build-e421b10f1c50aa11bd4ca299537c16bac0263da8.tar.gz build-e421b10f1c50aa11bd4ca299537c16bac0263da8.tar.bz2 | |
am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit 'e8ecab8d099f465d527f7bc0fbd04f26ac477a93':
Don't uncompress/page-align the jni libraries in apps_only build.
Diffstat (limited to 'core')
| -rw-r--r-- | core/definitions.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index fcd5c1a..78b0a39 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2026,13 +2026,23 @@ $(hide) cp $(2) $(dir $@)lib/$(1) endef +# For apps_only build, don't uncompress/page-align the jni libraries, +# because the apk may be run on older platforms that don't support loading jni directly from apk. +ifdef TARGET_BUILD_APPS +JNI_COMPRESS_FLAGS := +ZIPALIGN_PAGE_ALIGN_FLAGS := +else +JNI_COMPRESS_FLAGS := -0 +ZIPALIGN_PAGE_ALIGN_FLAGS := -p +endif + define add-jni-shared-libs-to-package $(hide) rm -rf $(dir $@)lib $(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 -0 $(notdir $@) lib) +$(hide) (cd $(dir $@) && zip -r $(JNI_COMPRESS_FLAGS) $(notdir $@) lib) $(hide) rm -rf $(dir $@)lib endef @@ -2078,7 +2088,8 @@ endef define align-package $(hide) mv $@ $@.unaligned $(hide) $(ZIPALIGN) \ - -f -p \ + -f \ + $(ZIPALIGN_PAGE_ALIGN_FLAGS) \ 4 \ $@.unaligned $@.aligned $(hide) mv $@.aligned $@ |