Merge "Fix TARGET_ASAN build."

2015-12-07 19:32:21 +00:00
parent 73661d4220 03b6e8b6c4
commit 9bbc67b55a
1 changed files with 2 additions and 0 deletions
--- a/core/Makefile
+++ b/core/Makefile
@@ -1561,8 +1561,10 @@ endif
 	$(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.