commit 8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd
author Ying Wang <wangying@android.com> Tue Dec 08 03:01:18 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 03:01:18 2015 +0000
tree ab2d6df63071ac9af42b2d3c0785e0b3fd2448c4
parent fb70c580b1497a31ff345b36f032241fa55415b2
parent 4f0cb0307b93b407abe110f3d17085d7807c137c

Merge "Fix TARGET_ASAN build." am: 9bbc67b55a
am: 4f0cb0307b

* commit '4f0cb0307b93b407abe110f3d17085d7807c137c':
  Fix TARGET_ASAN build.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 1664646..e82e328 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1562,9 +1562,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