commit 9bbc67b55ac6876920b3ca5a73673d0a10c3fb52
author Ying Wang <wangying@android.com> Mon Dec 07 19:32:21 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 07 19:32:21 2015 +0000
tree ad907bad243bf71e6af4575e87b04159f0d4d8ad
parent 73661d4220b85987ee5e5f34a3fc538283c19c34
parent 03b6e8b6c4ad1d423256269b738a87e307ce5d55

Merge "Fix TARGET_ASAN build."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 67ad228..9d6a455 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1561,9 +1561,11 @@
 	$(hide) mkdir -p $(zip_root)/OTA
 	$(hide) $(ACP) $(INSTALLED_ANDROID_INFO_TXT_TARGET) $(zip_root)/OTA/
 ifneq ($(AB_OTA_UPDATER),true)
+ifneq ($(built_ota_tools),)
 	$(hide) mkdir -p $(zip_root)/OTA/bin
 	$(hide) $(ACP) $(PRIVATE_OTA_TOOLS) $(zip_root)/OTA/bin/
 endif
+endif
 	@# Files that do not end up in any images, but are necessary to
 	@# build them.
 	$(hide) mkdir -p $(zip_root)/META