commit 5ed27e2d2f10b92b9b33c96a311fdf56df5fabcb
author Andreas Gampe <agampe@google.com> Thu Jun 30 20:20:38 2016 -0700
committer Andreas Gampe <agampe@google.com> Thu Jun 30 20:49:55 2016 -0700
tree feec3ee09854897fdfeb655b3fbcadcc136e4e1c
parent 3f7c34859e484be7ec710837fbdb9563c3f8d328

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

(cherry picked from commit cf6268f471f50599c004f6f18ee662273a0542b8)

Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index ce31ddb..26fed24 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -380,7 +380,7 @@
 TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc
 
 $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR_EXECUTABLES)
-$(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
 $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_APPS := $(TARGET_OUT_VENDOR_APPS)
 
 TARGET_OUT_OEM := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_OEM)