diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 20:24:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 20:24:22 +0000 |
| commit | 70ae5e23fc3596c9456e88d38ad346f54e50c95c (patch) | |
| tree | f198181bbf2274d5e39027d52a49826e42f34a9a /core/envsetup.mk | |
| parent | 59c9bea1da01ec19db994060d5ccc5cd5aa01adb (diff) | |
| parent | 0d27626620676dbe72bf5c020008bb2dad20d75f (diff) | |
| download | build-70ae5e23fc3596c9456e88d38ad346f54e50c95c.zip build-70ae5e23fc3596c9456e88d38ad346f54e50c95c.tar.gz build-70ae5e23fc3596c9456e88d38ad346f54e50c95c.tar.bz2 | |
am 0d276266: am 128cd1b7: am 6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '0d27626620676dbe72bf5c020008bb2dad20d75f':
Add global variable HOST_LIBRARY_PATH.
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 9e4e47e..974647e 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -247,6 +247,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 @@ -276,8 +279,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 |