Merge "Fix HOST_LIBRARY_PATH." into lmp-dev (e7391fcf) · Commits · e / os / android_build

core/envsetup.mk

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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