diff options
| author | Ying Wang <wangying@google.com> | 2014-08-14 11:03:56 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-08-14 11:03:56 -0700 |
| commit | d481b112f2709deb0832a15dad112becc5ca2f67 (patch) | |
| tree | 025563ef70c576f1e7878a6986233e7241bed5cd /core/envsetup.mk | |
| parent | 45ff36ee4c85c215df5cd2ec8425e3062d758976 (diff) | |
| download | build-d481b112f2709deb0832a15dad112becc5ca2f67.zip build-d481b112f2709deb0832a15dad112becc5ca2f67.tar.gz build-d481b112f2709deb0832a15dad112becc5ca2f67.tar.bz2 | |
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
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 96044b3..124a91b 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 |