StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't use ziptime with unbundled builds"

Browse Source
This commit is contained in:
Dan Willemsen
2015-11-04 00:24:59 +00:00
committed by Gerrit Code Review
parent e47d8b99a2 a25ddad7d6
commit 29a6675983
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@@ -524,7 +524,9 @@ ACP := $(BUILD_OUT_EXECUTABLES)/acp$(BUILD_EXECUTABLE_SUFFIX)
# dx is java behind a shell script; no .exe necessary. # dx is java behind a shell script; no .exe necessary.
DX := $(HOST_OUT_EXECUTABLES)/dx DX := $(HOST_OUT_EXECUTABLES)/dx
ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX) ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX)
ifndef TARGET_BUILD_APPS
ZIPTIME := $(HOST_OUT_EXECUTABLES)/ziptime$(HOST_EXECUTABLE_SUFFIX) ZIPTIME := $(HOST_OUT_EXECUTABLES)/ziptime$(HOST_EXECUTABLE_SUFFIX)
endif
# relocation packer # relocation packer
RELOCATION_PACKER := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/relocation_packer/relocation_packer RELOCATION_PACKER := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/relocation_packer/relocation_packer

2
core/definitions.mk
View File

@@ -2149,9 +2149,11 @@ endef
# Remove dynamic timestamps from packages # Remove dynamic timestamps from packages
# #
ifndef TARGET_BUILD_APPS
define remove-timestamps-from-package define remove-timestamps-from-package
$(hide) $(ZIPTIME) $@ $(hide) $(ZIPTIME) $@
endef endef
endif
# Uncompress shared libraries embedded in an apk. # Uncompress shared libraries embedded in an apk.
# #