am 3c6e4910: Merge "Fix HOST_LIBRARY_PATH."

* commit '3c6e4910a6646e36425e5c6ea4b7cc4bee47b6ca':
  Fix HOST_LIBRARY_PATH.
This commit is contained in:
Ying Wang
2014-08-14 20:03:23 +00:00
committed by Android Git Automerger

View File

@@ -238,7 +238,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