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

Commit babf44a1 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

Merge "Enable incremental builds for ASAN. (make)" 

am: 1c84862c

Change-Id: I8454f01d7c353d1cab05b3542a3e1654263de1ac
parents 6d8d482f 1c84862c

core/envsetup.mk

+17 −3
Original line number Diff line number Diff line
@@ -404,10 +404,19 @@ $(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_SHARED_LIBRARIES := $(HOST_CROSS 
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_EXECUTABLES := $(HOST_CROSS_OUT_EXECUTABLES)

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest64



ifneq ($(filter address,$(SANITIZE_TARGET)),)

  TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_asan

else

  TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj

endif

TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include

TARGET_OUT_INTERMEDIATE_LIBRARIES := $(TARGET_OUT_INTERMEDIATES)/lib



ifneq ($(filter address,$(SANITIZE_TARGET)),)

  TARGET_OUT_COMMON_INTERMEDIATES := $(TARGET_COMMON_OUT_ROOT)/obj_asan

else

  TARGET_OUT_COMMON_INTERMEDIATES := $(TARGET_COMMON_OUT_ROOT)/obj

endif



TARGET_OUT_GEN := $(PRODUCT_OUT)/gen

TARGET_OUT_COMMON_GEN := $(TARGET_COMMON_OUT_ROOT)/gen
@@ -449,7 +458,12 @@ TARGET_2ND_ARCH_MODULE_SUFFIX := _$(TARGET_2ND_ARCH) 
else

TARGET_2ND_ARCH_MODULE_SUFFIX := $(HOST_2ND_ARCH_MODULE_SUFFIX)

endif



ifneq ($(filter address,$(SANITIZE_TARGET)),)

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)_asan

else

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)