Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d757f6 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

Merge "Build ota packages for SANITIZE_TARGET other than "address"." am: f05ff886 

am: 37bec41b

Change-Id: I9c94315892b88aa9d0f844b5f67897ba711659f0
parents fe44bc3b 37bec41b

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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