diff options
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 8d03746..19fdad6 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -195,14 +195,18 @@ endif include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk ####################################### # Sign and align non-presigned .apks. -$(built_module) : PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES) + +# The embedded prebuilt jni to uncompress. +ifndef embedded_prebuilt_jni_libs +# No LOCAL_PREBUILT_JNI_LIBS, uncompress all. +embedded_prebuilt_jni_libs := 'lib/*.so' +endif +$(built_module): PRIVATE_EMBEDDED_JNI_LIBS := $(embedded_prebuilt_jni_libs) + $(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) $(transform-prebuilt-to-target) ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) @# Only strip out files if we can re-sign the package. -ifdef extracted_jni_libs - $(hide) zip -d $@ 'lib/*.so' # strip embedded JNI libraries. -endif ifdef LOCAL_DEX_PREOPT ifneq (nostripping,$(LOCAL_DEX_PREOPT)) $(call dexpreopt-remove-classes.dex,$@) @@ -210,9 +214,7 @@ endif endif $(sign-package) endif -ifeq ($(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES),true) $(uncompress-shared-libs) -endif $(align-package) ############################### |