From cf6268f471f50599c004f6f18ee662273a0542b8 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 30 Jun 2016 20:20:38 -0700 Subject: [PATCH] Build: Fix vendor sanitizer library for secondary arch Fix the directory for secondary-architecture libraries under sanitization. These incorrectly wrote into vendor/lib instead of data/vendor/lib. Bug: 29498013 Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f --- core/envsetup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 26042fa0f..1df25d2be 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -411,9 +411,9 @@ TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR_EXECUTABLES) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) -$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib/$(TARGET_2ND_ARCH) +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib/$(TARGET_2ND_ARCH) else -$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib endif $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_APPS := $(TARGET_OUT_VENDOR_APPS)