From 60b7296d42514daeb1b118740821e17af763410d Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 11 Sep 2018 23:11:07 -0700 Subject: [PATCH] Fix ASAN + product_services Test: SANITIZE_TARGET=address m nothing Change-Id: I9724169b4cf474b4c963d33263ba52ebfff6efff --- core/envsetup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 4396dd2714..8ffbc194f1 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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