StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."

Browse Source 
* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
  More consistent host library path in multilib build.
This commit is contained in:
Ying Wang
2014-07-01 00:35:21 +00:00
committed by Android Git Automerger
parent 0635498086 0d0b7b3669
commit e050245b7a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/envsetup.mk
View File

@@ -219,7 +219,11 @@ OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs
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
@@ -238,13 +242,7 @@ HOST_2ND_ARCH_VAR_PREFIX := 2ND_
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.