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

Commit 3de35b8a authored Sep 03, 2016 by Colin Cross Committed by android-build-merger Sep 03, 2016

Merge "Remove HOST_PREFER_32_BIT" am: 182ff5e2 am: a1289765

am: 0ab4eb97

Change-Id: I5834da777a75fb0c269de886f0233e8796c6aee7

parents 48e332d7 0ab4eb97

core/clang/config.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -138,11 +138,6 @@ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan
		# provides to Clang (for supporting features like -ftrapv).
		COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras

		ifeq ($(HOST_PREFER_32_BIT),true)
		# We don't have 32-bit prebuilt libLLVM/libclang, so force to build them from source.
		FORCE_BUILD_LLVM_COMPONENTS := true
		endif

		# A list of projects that are allowed to set LOCAL_CLANG to false.
		# INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS is defined later in other config.mk.
		LOCAL_CLANG_EXCEPTION_PROJECTS = \

core/envsetup.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -299,11 +299,7 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_NATIVE_TESTS := $(HOST_OUT)/nativetest

		# The default host library path.
		# It always points to the path where we build libraries in the default bitness.
		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

		# Out for HOST_CROSS_2ND_ARCH
		HOST_CROSS_2ND_ARCH_VAR_PREFIX := 2ND_

core/executable_prefer_symlink.mk

+1 −5

Original line number	Diff line number	Diff line
		@@ -33,11 +33,7 @@ ifneq ($(LOCAL_IS_HOST_MODULE),true)
		endif
		else
		my_symlink := $(addprefix $(HOST_OUT)/bin/, $(LOCAL_MODULE))
		ifneq ($(HOST_PREFER_32_BIT),true)
		my_src_binary_name := $(LOCAL_MODULE_STEM_64)
		else
		my_src_binary_name := $(LOCAL_MODULE_STEM_32)
		endif
		endif

		$(call symlink-file,$(my_module_path)/$(my_src_binary_name),$(my_src_binary_name),$(my_symlink))

core/host_executable.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -6,14 +6,10 @@ include $(BUILD_SYSTEM)/multilib.mk

		ifndef LOCAL_MODULE_HOST_ARCH
		ifndef my_module_multilib
		ifeq ($(HOST_PREFER_32_BIT),true)
		my_module_multilib := 32
		else
		# By default we only build host module for the first arch.
		my_module_multilib := first
		endif
		endif
		endif

		ifeq ($(LOCAL_NO_FPIE),)
		LOCAL_LDFLAGS += $(HOST_FPIE_FLAGS)

core/host_shared_library.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -6,14 +6,10 @@ include $(BUILD_SYSTEM)/multilib.mk

		ifndef LOCAL_MODULE_HOST_ARCH
		ifndef my_module_multilib
		ifeq ($(HOST_PREFER_32_BIT),true)
		my_module_multilib := 32
		else
		# libraries default to building for both architecturess
		my_module_multilib := both
		endif
		endif
		endif

		LOCAL_2ND_ARCH_VAR_PREFIX :=
		include $(BUILD_SYSTEM)/module_arch_supported.mk