commit 5bac962903f34f53b20fbbc726463df63d0e3952
author Ying Wang <wangying@google.com> Thu Aug 14 11:03:56 2014 -0700
committer Ying Wang <wangying@google.com> Thu Aug 14 12:48:25 2014 -0700
tree 98726c284cbbd0918f44378b424bd96dd5d9a876
parent 9c80e8a531f7bcfe42550aad12d2a8d7d4cb74f5

Fix HOST_LIBRARY_PATH.

Since we switched to $(HOST_OUT)/lib64 for 64-bit libraries and
$(HOST_OUT)/lib for 32-bit libraries.

Change-Id: Ie43bc03c37e2ac8542412a7543a6af5d60c6f725

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 87371b9..a57041b 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -238,7 +238,11 @@
 
 # The default host library path.
 # It always points to the path where we build libraries in the default bitness.
-HOST_LIBRARY_PATH := $(HOST_OUT)/lib
+ifeq ($(HOST_PREFER_32_BIT),true)
+HOST_LIBRARY_PATH := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)
+else
+HOST_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)
+endif
 
 TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj
 TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include