From a25ddad7d6ab053aff89a0f9cfd8986758beb7c1 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 3 Nov 2015 16:09:49 -0800
Subject: [PATCH] Don't use ziptime with unbundled builds

Some of the trees are unable to compile native code with the normal
build rules, even though they can build kati.

Bug: 24201956
Change-Id: I2afc3468480b2c78407d62323e6b82979c8ee254
---
 core/config.mk      | 2 ++
 core/definitions.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/config.mk b/core/config.mk
index 483943851..5678a832c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -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
diff --git a/core/definitions.mk b/core/definitions.mk
index ad686883a..5a6a411c8 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -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.
 #