commit 810965d23cfb72ef9721df0b679d69710ea82fbf
author Tao Bao <tbao@google.com> Fri Nov 16 01:56:05 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 16 01:56:05 2018 +0000
tree df40cad7462e7875ded6f2f8cd25601b571ef90e
parent f05ff886b8e6810be15b35c03a0414faf891eae8
parent 9788b4ed31e58301314d226ad8028610642a12e1

Merge "releasetools: Temporarily disable verifying AVB-signed images."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 3e0125e..97322c6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3071,7 +3071,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)
@@ -3257,7 +3257,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