Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a66759 authored Nov 04, 2015 by Dan Willemsen Committed by Gerrit Code Review Nov 04, 2015

Merge "Don't use ziptime with unbundled builds"

parents e47d8b99 a25ddad7

core/config.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -524,7 +524,9 @@ ACP := $(BUILD_OUT_EXECUTABLES)/acp$(BUILD_EXECUTABLE_SUFFIX)
		# dx is java behind a shell script; no .exe necessary.
		DX := $(HOST_OUT_EXECUTABLES)/dx
		ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX)
		ifndef TARGET_BUILD_APPS
		ZIPTIME := $(HOST_OUT_EXECUTABLES)/ziptime$(HOST_EXECUTABLE_SUFFIX)
		endif

		# relocation packer
		RELOCATION_PACKER := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/relocation_packer/relocation_packer

core/definitions.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -2149,9 +2149,11 @@ endef

		# Remove dynamic timestamps from packages
		#
		ifndef TARGET_BUILD_APPS
		define remove-timestamps-from-package
		$(hide) $(ZIPTIME) $@
		endef
		endif

		# Uncompress shared libraries embedded in an apk.
		#