Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2ce04b4 authored May 05, 2015 by Dan Albert Committed by Gerrit Code Review May 05, 2015

Merge "Make Windows a non-multilib target."

parents b5ccb461 dc941379

core/envsetup.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ $(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
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES)
		$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT_JAVA_LIBRARIES)

		# The default host library path.
		# It always points to the path where we build libraries in the default bitness.

core/multilib.mk

+8 −0

Original line number	Diff line number	Diff line
		@@ -13,3 +13,11 @@ ifeq (,$(filter 32 64 first both none,$(my_module_multilib)))
		$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE))
		endif
		endif # my_module_multilib defined

		# Windows is a special case. Linux and Darwin are both multilib builds, but we
		# don't have a 64-bit Windows build, so make sure it's not a multilib build.
		ifdef LOCAL_IS_HOST_MODULE
		ifeq ($(HOST_OS),windows)
		my_module_multilib := 32
		endif
		endif