Merge "Support host multilib build" (a74ade94) · Commits · e / os / android_build

core/base_rules.mk

+4 −8

Original line number	Diff line number	Diff line
		@@ -98,16 +98,10 @@ ifneq ($(words $(LOCAL_MODULE_CLASS)),1)
		$(error $(LOCAL_PATH): LOCAL_MODULE_CLASS must contain exactly one word, not "$(LOCAL_MODULE_CLASS)")
		endif

		ifndef LOCAL_IS_HOST_MODULE
		my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32)
		endif
		my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32)

		ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
		ifndef LOCAL_IS_HOST_MODULE
		my_multilib_module_path := $(strip $(LOCAL_MODULE_PATH_$(my_32_64_bit_suffix)))
		else
		my_multilib_module_path :=
		endif
		ifdef my_multilib_module_path
		my_module_path := $(my_multilib_module_path)
		else
		@@ -148,7 +142,7 @@ endif
		my_register_name := $(LOCAL_MODULE)
		ifdef LOCAL_2ND_ARCH_VAR_PREFIX
		ifndef LOCAL_NO_2ND_ARCH_MODULE_SUFFIX
		my_register_name := $(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX)
		my_register_name := $(LOCAL_MODULE)$($(my_prefix)2ND_ARCH_MODULE_SUFFIX)
		endif
		endif
		# Make sure that this IS_HOST/CLASS/MODULE combination is unique.
		@@ -516,6 +510,8 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_HOST:= $(my_host)

		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_INTERMEDIATES_DIR:= $(intermediates)

		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX)

		# Tell the module and all of its sub-modules who it is.
		$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MODULE:= $(my_register_name)

core/binary.mk

+19 −21

Original line number	Diff line number	Diff line
		@@ -113,22 +113,20 @@ my_cxx := $(LOCAL_CXX)
		my_c_includes := $(LOCAL_C_INCLUDES)
		my_generated_sources := $(LOCAL_GENERATED_SOURCES)

		ifndef LOCAL_IS_HOST_MODULE
		my_src_files += $(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SRC_FILES_$(my_32_64_bit_suffix))
		my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SHARED_LIBRARIES_$(my_32_64_bit_suffix))
		my_cflags += $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix))
		my_cppflags += $(LOCAL_CPPFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CPPFLAGS_$(my_32_64_bit_suffix))
		my_ldflags += $(LOCAL_LDFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_LDFLAGS_$(my_32_64_bit_suffix))
		my_asflags += $(LOCAL_ASFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_ASFLAGS_$(my_32_64_bit_suffix))
		my_c_includes += $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix))
		my_generated_sources += $(LOCAL_GENERATED_SOURCES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_GENERATED_SOURCES_$(my_32_64_bit_suffix))
		my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SRC_FILES_$(my_32_64_bit_suffix))
		my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SHARED_LIBRARIES_$(my_32_64_bit_suffix))
		my_cflags += $(LOCAL_CFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix))
		my_cppflags += $(LOCAL_CPPFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CPPFLAGS_$(my_32_64_bit_suffix))
		my_ldflags += $(LOCAL_LDFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_LDFLAGS_$(my_32_64_bit_suffix))
		my_asflags += $(LOCAL_ASFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_ASFLAGS_$(my_32_64_bit_suffix))
		my_c_includes += $(LOCAL_C_INCLUDES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix))
		my_generated_sources += $(LOCAL_GENERATED_SOURCES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_GENERATED_SOURCES_$(my_32_64_bit_suffix))

		# arch-specific static libraries go first so that generic ones can depend on them
		my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)
		my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)
		my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)
		my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)

		my_cflags := $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_UNSUPPORTED_CFLAGS),$(my_cflags))
		endif
		my_cflags := $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_UNSUPPORTED_CFLAGS),$(my_cflags))

		# Add static HAL libraries
		ifdef LOCAL_HAL_STATIC_LIBRARIES
		@@ -234,15 +232,15 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_glob
		else # LOCAL_IS_HOST_MODULE

		ifeq ($(LOCAL_CLANG),true)
		my_host_global_cflags := $(CLANG_HOST_GLOBAL_CFLAGS)
		my_host_global_cppflags := $(CLANG_HOST_GLOBAL_CPPFLAGS)
		my_host_global_ldflags := $(CLANG_HOST_GLOBAL_LDFLAGS)
		my_host_c_includes := $(HOST_C_INCLUDES) $(CLANG_CONFIG_EXTRA_HOST_C_INCLUDES)
		my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CFLAGS)
		my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CPPFLAGS)
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_LDFLAGS)
		my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_C_INCLUDES) $(CLANG_CONFIG_EXTRA_HOST_C_INCLUDES)
		else
		my_host_global_cflags := $(HOST_GLOBAL_CFLAGS)
		my_host_global_cppflags := $(HOST_GLOBAL_CPPFLAGS)
		my_host_global_ldflags := $(HOST_GLOBAL_LDFLAGS)
		my_host_c_includes := $(HOST_C_INCLUDES)
		my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CFLAGS)
		my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CPPFLAGS)
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LDFLAGS)
		my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_C_INCLUDES)
		endif # LOCAL_CLANG

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_C_INCLUDES := $(my_host_c_includes)

core/clang/HOST_x86.mk

+8 −8

Original line number	Diff line number	Diff line

		include $(BUILD_SYSTEM)/clang/x86.mk
		include $(BUILD_SYSTEM)/clang/x86_common.mk
		include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk

		ifeq ($(HOST_OS),linux)
		CLANG_CONFIG_x86_HOST_TRIPLE := i686-linux-gnu
		@@ -44,21 +44,21 @@ CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS := \
		$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS) \
		-target $(CLANG_CONFIG_x86_HOST_TRIPLE)

		define convert-to-host-clang-flags
		define $(clang_2nd_arch_prefix)convert-to-host-clang-flags
		$(strip \
		$(call subst-clang-incompatible-x86-flags,\
		$(filter-out $(CLANG_CONFIG_x86_UNKNOWN_CFLAGS),\
		$(1))))
		endef

		CLANG_HOST_GLOBAL_CFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_GLOBAL_CFLAGS)) \
		$(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_CFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_GLOBAL_CFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_EXTRA_CFLAGS)

		CLANG_HOST_GLOBAL_CPPFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_GLOBAL_CPPFLAGS)) \
		$(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_CPPFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_GLOBAL_CPPFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS)

		CLANG_HOST_GLOBAL_LDFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_GLOBAL_LDFLAGS)) \
		$(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_LDFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS)

core/clang/HOST_x86_64.mk

+1 −1

Original line number	Diff line number	Diff line

		include $(BUILD_SYSTEM)/clang/x86_64.mk
		include $(BUILD_SYSTEM)/clang/x86_common.mk
		include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk

		ifeq ($(HOST_OS),linux)
		CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-linux-gnu

core/clang/HOST_x86_common.mk

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		# Shared by HOST_x86.mk and HOST_x86_64.mk.

		ifeq ($(HOST_OS),darwin)
		# nothing required here yet
		endif

		ifeq ($(HOST_OS),linux)
		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
		-no-integrated-as

		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
		-no-integrated-as

		ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),)
		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \
		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux \
		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \
		-no-integrated-as

		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
		-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
		-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \
		-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \
		-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/ \
		-no-integrated-as
		else
		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \
		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux/32 \
		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \
		-no-integrated-as

		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
		-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
		-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \
		-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \
		-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/ \
		-no-integrated-as
		endif
		endif # Linux

		ifeq ($(HOST_OS),windows)
		# nothing required here yet
		endif