commit 5d06f240e376c9d0ee87f234228860ff541531a8
author Evgenii Stepanov <eugenis@google.com> Wed Nov 14 14:12:10 2018 -0800
committer Evgenii Stepanov <eugenis@google.com> Thu Nov 15 11:14:09 2018 -0800
tree d22f35240a5158a502a8298ccf70ea9ce51843c8
parent e0e0cadb216c03fd22101f79cc4750c6884eb473

Build ota packages for SANITIZE_TARGET other than "address".

HWASan OTAs should work fine.

Bug: 119436631
Test: make SANITIZE_TARGET=hwaddress dist
Change-Id: I87c8ca58b924a478679879d09a34c44cd5832470

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 55bcbcc..6b3fe80 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3058,7 +3058,7 @@
   ifeq ($(TARGET_SKIP_OTA_PACKAGE),true)
     build_ota_package := false
   endif
-  ifneq ($(strip $(SANITIZE_TARGET)),)
+  ifneq (,$(filter address, $(SANITIZE_TARGET)))
     build_ota_package := false
   endif
   ifeq ($(TARGET_PRODUCT),sdk)
@@ -3244,7 +3244,7 @@
 built_ota_tools :=
 
 # We can't build static executables when SANITIZE_TARGET=address
-ifeq ($(strip $(SANITIZE_TARGET)),)
+ifeq (,$(filter address, $(SANITIZE_TARGET)))
 built_ota_tools += \
     $(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater
 endif