Merge "Build ota packages for SANITIZE_TARGET other than "address"."

This commit is contained in:
Evgenii Stepanov 2018-11-15 22:26:39 +00:00 committed by Gerrit Code Review
commit f05ff886b8

View file

@ -3071,7 +3071,7 @@ else
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 @@ endef
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