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

Commit 83aca79b authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Don't include static executables when SANITIZE_TARGET=address"

parents b7f56b97 e6e544e5

core/Makefile

+13 −5
Original line number Diff line number Diff line
@@ -1339,10 +1339,16 @@ endef 


built_ota_tools := \

    $(call intermediates-dir-for,EXECUTABLES,applypatch,,,$(TARGET_PREFER_32_BIT))/applypatch \

	$(call intermediates-dir-for,EXECUTABLES,applypatch_static,,,$(TARGET_PREFER_32_BIT))/applypatch_static \

    $(call intermediates-dir-for,EXECUTABLES,sqlite3,,,$(TARGET_PREFER_32_BIT))/sqlite3



# We can't build static executables when SANITIZE_TARGET=address

ifneq (address,$(SANITIZE_TARGET))

built_ota_tools += \

    $(call intermediates-dir-for,EXECUTABLES,check_prereq,,,$(TARGET_PREFER_32_BIT))/check_prereq \

	$(call intermediates-dir-for,EXECUTABLES,sqlite3,,,$(TARGET_PREFER_32_BIT))/sqlite3 \

    $(call intermediates-dir-for,EXECUTABLES,applypatch_static,,,$(TARGET_PREFER_32_BIT))/applypatch_static \

    $(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater

endif



$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)



$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION)
@@ -1491,6 +1497,7 @@ ifneq ($(filter $(MAKECMDGOALS),target-files-package),) 
$(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))

endif



ifneq ($(SANITIZE_TARGET),address)

ifneq ($(TARGET_PRODUCT),sdk)

ifeq ($(filter generic%,$(TARGET_DEVICE)),)

ifneq ($(TARGET_NO_KERNEL),true)
@@ -1526,6 +1533,7 @@ endif # recovery_fstab is defined 
endif    # TARGET_NO_KERNEL != true

endif    # TARGET_DEVICE != generic*

endif    # TARGET_PRODUCT != sdk

endif    # SANITIZE_TARGET != address



# -----------------------------------------------------------------

# The update package