commit 2aac82f27cb33d3624ac162c5cd5117389b9af5e
author Andreas Gampe <agampe@google.com> Fri Jul 01 04:37:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 01 04:37:36 2016 +0000
tree aeb25b12028f6f936c289f9f8ea0d099eafe3f6f
parent fd6304f541d4f9b3f106f69b2fc4eaae138aef81
parent 80b32402dced361a2ea8fc4804753fe0f4ad2981

Merge \\"Build: Fix vendor sanitizer library for secondary arch\\" am: 2302a76966
am: 80b32402dc

Change-Id: I6b59928b0d37aadbc29b9162521340062ec7d979

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index cdb659a..eec61d1 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -415,9 +415,9 @@
 
 $(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)