resolved conflicts for merge of eec386a4 to master (87a21c8b) · Commits · e / os / android_build

core/package_internal.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -432,12 +432,12 @@ endif
		ifdef LOCAL_JACK_ENABLED
		$(add-carried-jack-resources)
		endif
		$(sign-package)
		ifdef LOCAL_DEX_PREOPT
		ifneq (nostripping,$(LOCAL_DEX_PREOPT))
		$(call dexpreopt-remove-classes.dex,$@)
		endif
		endif
		$(sign-package)
		@# Alignment must happen after all other zip operations.
		$(align-package)

+4 −3

Original line number	Diff line number	Diff line
		@@ -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) : $(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
		ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
		$(sign-package)
		endif
		ifdef LOCAL_DEX_PREOPT
		ifneq (nostripping,$(LOCAL_DEX_PREOPT))
		$(call dexpreopt-remove-classes.dex,$@)
		endif
		endif
		$(sign-package)
		endif
		$(align-package)