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

Commit 60b7296d authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix ASAN + product_services 

Test: SANITIZE_TARGET=address m nothing
Change-Id: I9724169b4cf474b4c963d33263ba52ebfff6efff
parent 32de5bae

core/envsetup.mk

+2 −2
Original line number Diff line number Diff line
@@ -986,11 +986,11 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS_PRIVILEGED := $(TARGET_OUT_ 


TARGET_OUT_PRODUCT_SERVICES := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT_SERVICES)

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

target_out_product_services_shared_libraries_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services

target_out_product_services_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services

ifeq ($(SANITIZE_LITE),true)

# When using SANITIZE_LITE, APKs must not be packaged with sanitized libraries, as they will not

# work with unsanitized app_process. For simplicity, generate APKs into /data/asan/.

target_out_product_services_app_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services

target_out_product_services_app_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services

else

target_out_product_services_app_base := $(TARGET_OUT_PRODUCT_SERVICES)

endif