diff options
| author | Ying Wang <wangying@google.com> | 2014-06-10 12:04:56 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-10 12:04:56 -0700 |
| commit | c4595868c4d1105fbb0cfda6560bd0fb126a7cc1 (patch) | |
| tree | b141cddfb2e78fbdac2a66ed8ad1bdbd2c0d3f25 /core/envsetup.mk | |
| parent | c383862020034b3db4e365aaf501a84a35e85ffe (diff) | |
| download | build-c4595868c4d1105fbb0cfda6560bd0fb126a7cc1.zip build-c4595868c4d1105fbb0cfda6560bd0fb126a7cc1.tar.gz build-c4595868c4d1105fbb0cfda6560bd0fb126a7cc1.tar.bz2 | |
Add global variable HOST_LIBRARY_PATH.
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
version the librareies are built by default, use HOST_LIBRARY_PATH.
Bug:13751317
Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 8013e18..1962513 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -245,6 +245,9 @@ $(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. +# It always points to the path where we build libraries in the default bitness. +HOST_LIBRARY_PATH := $(HOST_OUT)/lib TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include @@ -274,8 +277,8 @@ TARGET_OUT_NOTICE_FILES := $(TARGET_OUT_INTERMEDIATES)/NOTICE_FILES TARGET_OUT_FAKE := $(PRODUCT_OUT)/fake_packages # Out for TARGET_2ND_ARCH -TARGET_2ND_ARCH_VAR_PREFIX := 2ND_ -TARGET_2ND_ARCH_MODULE_SUFFIX := _32 +TARGET_2ND_ARCH_VAR_PREFIX := $(HOST_2ND_ARCH_VAR_PREFIX) +TARGET_2ND_ARCH_MODULE_SUFFIX := $(HOST_2ND_ARCH_MODULE_SUFFIX) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(TARGET_OUT)/lib |