diff options
| author | Ying Wang <wangying@google.com> | 2014-06-10 20:31:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 20:31:23 +0000 |
| commit | 6cc4598d18c660d4e253970bc875be5fa08c770b (patch) | |
| tree | 353a19b79c23ecfd85297ae2671fbe67c8d85194 | |
| parent | 47cdacd5e633c8256a5dd32c769b5469882fc0aa (diff) | |
| parent | c4595868c4d1105fbb0cfda6560bd0fb126a7cc1 (diff) | |
| download | build-6cc4598d18c660d4e253970bc875be5fa08c770b.tar.gz | |
Merge "Add global variable HOST_LIBRARY_PATH."
| -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 8013e181a0..196251328d 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 |