Merge "More consistent host library path in multilib build." (4b539d15) · Commits · e / os / android_build

core/envsetup.mk

+4 −6

Original line number	Diff line number	Diff line
		@@ -218,7 +218,11 @@ OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs
		BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin

		HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin
		ifeq (x86_64,$(HOST_ARCH))
		HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64
		else
		HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
		endif
		HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework
		HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon

		@@ -236,13 +240,7 @@ HOST_2ND_ARCH_VAR_PREFIX := 2ND_
		HOST_2ND_ARCH_MODULE_SUFFIX := _32
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj32
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES)/lib
		ifeq ($(HOST_PREFER_32_BIT),true)
		# To keep path compatibility, put 32-bit libs in lib/ and 64-bit libs in lib64/.
		HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
		else
		$(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.