commit 4b539d1533a5d8647e5f54b0a41b2a49d7f4c785
author Ying Wang <wangying@google.com> Tue Jul 01 00:16:30 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 30 22:29:38 2014 +0000
tree 8f91429c70993a23ff3866abc2a2754ba6308b33
parent 4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93
parent 36ef50f2a2e2de4ee568a94e9bb06813542a0ca1

Merge "More consistent host library path in multilib build."

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 1962513..9caf7c0 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -218,7 +218,11 @@
 BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin
 
 HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin
+ifeq (x86_64,$(HOST_ARCH))
+HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64
+else
 HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
+endif
 HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework
 HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon
 
@@ -236,13 +240,7 @@
 HOST_2ND_ARCH_MODULE_SUFFIX := _32
 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj32
 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES)/lib
-ifeq ($(HOST_PREFER_32_BIT),true)
-# To keep path compatibility, put 32-bit libs in lib/ and 64-bit libs in lib64/.
-HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64
 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
-else
-$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib32
-endif
 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES)
 
 # The default host library path.