diff options
| author | Ying Wang <wangying@google.com> | 2014-08-14 20:09:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-14 20:09:00 +0000 |
| commit | f58dd4fd2aa8410dcf78c984da1c7267793b88f5 (patch) | |
| tree | a31a37a0febc10b21e509f1dbd12b26620c1c95d /core/envsetup.mk | |
| parent | f69c8fbbd729cd6fcabdcc0fee3e0a9eeee6e68f (diff) | |
| parent | 798c8430d5d5389e15379d64119dfc75cfc61ff8 (diff) | |
| download | build-f58dd4fd2aa8410dcf78c984da1c7267793b88f5.zip build-f58dd4fd2aa8410dcf78c984da1c7267793b88f5.tar.gz build-f58dd4fd2aa8410dcf78c984da1c7267793b88f5.tar.bz2 | |
am 798c8430: am 3c6e4910: Merge "Fix HOST_LIBRARY_PATH."
* commit '798c8430d5d5389e15379d64119dfc75cfc61ff8':
Fix HOST_LIBRARY_PATH.
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index fe995e4..ce9d34e 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -260,7 +260,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 |