diff options
| author | Ying Wang <wangying@google.com> | 2014-07-01 00:35:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-01 00:35:21 +0000 |
| commit | e050245b7a73642db6dd582ec70b2393c97d4961 (patch) | |
| tree | daad4614e474d6d4c6c5bfd92b36d1795e1e17e9 /core/envsetup.mk | |
| parent | 06354980862aa30b43806780a9b68474e19dd918 (diff) | |
| parent | 0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e (diff) | |
| download | build-e050245b7a73642db6dd582ec70b2393c97d4961.zip build-e050245b7a73642db6dd582ec70b2393c97d4961.tar.gz build-e050245b7a73642db6dd582ec70b2393c97d4961.tar.bz2 | |
am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
More consistent host library path in multilib build.
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index bfaac26..e968fef 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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. |