From 5bac962903f34f53b20fbbc726463df63d0e3952 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Thu, 14 Aug 2014 11:03:56 -0700
Subject: 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to '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 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES)
 
 # 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
-- 
cgit v1.1