Merge "Build ota packages for SANITIZE_TARGET other than "address"."
am: f05ff886b8
Change-Id: I68cc3f99937c24d4ad32e2bf7fd6549e47c9cf42
This commit is contained in:
commit
37bec41be7
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue