tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move package signing after file stripping"

Browse source
This commit is contained in:
Kenny Root 2015-04-15 19:58:20 +00:00 committed by Gerrit Code Review
commit 03c6e8c586
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/package_internal.mk
View file

@ -402,12 +402,12 @@ ifeq ($(full_classes_jar),)
else else
$(add-dex-to-package) $(add-dex-to-package)
endif endif
$(sign-package)
ifdef LOCAL_DEX_PREOPT ifdef LOCAL_DEX_PREOPT
ifneq (nostripping,$(LOCAL_DEX_PREOPT)) ifneq (nostripping,$(LOCAL_DEX_PREOPT))
$(call dexpreopt-remove-classes.dex,$@) $(call dexpreopt-remove-classes.dex,$@)
endif endif
endif endif
$(sign-package)
@# Alignment must happen after all other zip operations. @# Alignment must happen after all other zip operations.
$(align-package) $(align-package)

7
core/prebuilt_internal.mk
View file

@ -193,16 +193,17 @@ include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
$(built_module) : PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES) $(built_module) : PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES)
$(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) $(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR)
$(transform-prebuilt-to-target) $(transform-prebuilt-to-target)
ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
@# Only strip out files if we can re-sign the package.
ifdef extracted_jni_libs ifdef extracted_jni_libs
$(hide) zip -d $@ 'lib/*.so' # strip embedded JNI libraries. $(hide) zip -d $@ 'lib/*.so' # strip embedded JNI libraries.
endif endif
ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
$(sign-package)
endif
ifdef LOCAL_DEX_PREOPT ifdef LOCAL_DEX_PREOPT
ifneq (nostripping,$(LOCAL_DEX_PREOPT)) ifneq (nostripping,$(LOCAL_DEX_PREOPT))
$(call dexpreopt-remove-classes.dex,$@) $(call dexpreopt-remove-classes.dex,$@)
endif endif
endif
$(sign-package)
endif endif
$(align-package) $(align-package)