StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 798c8430: am 3c6e4910: Merge "Fix HOST_LIBRARY_PATH."

Browse Source 
* commit '798c8430d5d5389e15379d64119dfc75cfc61ff8':
  Fix HOST_LIBRARY_PATH.
This commit is contained in:
Ying Wang
2014-08-14 20:09:00 +00:00
committed by Android Git Automerger
parent f69c8fbbd7 798c8430d5
commit f58dd4fd2a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/envsetup.mk
View File

@@ -260,7 +260,11 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES)
# The default host library path. # The default host library path.
# It always points to the path where we build libraries in the default bitness. # 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_INTERMEDIATES := $(PRODUCT_OUT)/obj
TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include