am 3221717f: am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75 (14203772) · Commits · e / os / android_build

core/64_bit_blacklist.mk

+0 −4

Original line number	Original line	Diff line number	Diff line
	ifneq ($(TARGET_2ND_ARCH),)		ifneq ($(TARGET_2ND_ARCH),)

	# JNI - needs 64-bit VM
	_64_bit_directory_blacklist += \
	packages/

	# Chromium/V8: needs 64-bit support		# Chromium/V8: needs 64-bit support
	_64_bit_directory_blacklist += \		_64_bit_directory_blacklist += \
	external/chromium-libpac \		external/chromium-libpac \

core/executable.mk

+24 −21

Original line number	Original line	Diff line number	Diff line
	@@ -8,19 +8,6 @@

	include $(BUILD_SYSTEM)/multilib.mk		include $(BUILD_SYSTEM)/multilib.mk

	ifeq ($(TARGET_PREFER_32_BIT),true)
	ifeq (,$(filter $(my_module_multilib),first both)
	# if TARGET_PREFER_32_BIT is not explicitly set to "first" or "both"
	# build only for secondary
	my_module_multilib := 32
	endif
	endif

	ifndef my_module_multilib
	# executables default to building for the first architecture
	my_module_multilib := first
	endif

	ifeq ($(my_module_multilib),both)		ifeq ($(my_module_multilib),both)
	ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),)		ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),)
	$(error $(LOCAL_PATH): LOCAL_MODULE_STEM_32 or LOCAL_MODULE_PATH_32 is required for LOCAL_MULTILIB := both for module $(LOCAL_MODULE))		$(error $(LOCAL_PATH): LOCAL_MODULE_STEM_32 or LOCAL_MODULE_PATH_32 is required for LOCAL_MULTILIB := both for module $(LOCAL_MODULE))
	@@ -32,26 +19,42 @@ else #!LOCAL_MULTILIB == both
	LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true		LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
	endif		endif

	my_skip_secondary_arch :=		# if TARGET_PREFER_32_BIT is set, try to build 32-bit first
			ifdef TARGET_2ND_ARCH
			ifeq ($(TARGET_PREFER_32_BIT),true)
			LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
			else
			LOCAL_2ND_ARCH_VAR_PREFIX :=
			endif
			endif

			my_skip_non_preferred_arch :=

	# check if first arch is supported		# check if preferred arch is supported
	include $(BUILD_SYSTEM)/module_arch_supported.mk		include $(BUILD_SYSTEM)/module_arch_supported.mk
	ifeq ($(my_module_arch_supported),true)		ifeq ($(my_module_arch_supported),true)
	# first arch is supported		# first arch is supported
	include $(BUILD_SYSTEM)/executable_internal.mk		include $(BUILD_SYSTEM)/executable_internal.mk
	ifneq ($(my_module_multilib),both)		ifneq ($(my_module_multilib),both)
	my_skip_secondary_arch := true		my_skip_non_preferred_arch := true
	endif		endif
	endif		endif

	# check if first arch was not supported or asked to build both		# check if preferred arch was not supported or asked to build both
	ifndef my_skip_secondary_arch		ifndef my_skip_non_preferred_arch
	ifdef TARGET_2ND_ARCH		ifdef TARGET_2ND_ARCH
	# check if secondary arch is supported
			# check if the non-preferred arch is the primary or secondary
			ifeq ($(TARGET_PREFER_32_BIT),true)
			LOCAL_2ND_ARCH_VAR_PREFIX :=
			else
	LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)		LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
			endif

			# check if non-preferred arch is supported
	include $(BUILD_SYSTEM)/module_arch_supported.mk		include $(BUILD_SYSTEM)/module_arch_supported.mk
	ifeq ($(my_module_arch_supported),true)		ifeq ($(my_module_arch_supported),true)
	# secondary arch is supported		# non-preferred arch is supported
	OVERRIDE_BUILT_MODULE_PATH :=		OVERRIDE_BUILT_MODULE_PATH :=
	LOCAL_BUILT_MODULE :=		LOCAL_BUILT_MODULE :=
	LOCAL_INSTALLED_MODULE :=		LOCAL_INSTALLED_MODULE :=
	@@ -62,7 +65,7 @@ LOCAL_INTERMEDIATE_TARGETS :=
	include $(BUILD_SYSTEM)/executable_internal.mk		include $(BUILD_SYSTEM)/executable_internal.mk
	endif		endif
	endif # TARGET_2ND_ARCH		endif # TARGET_2ND_ARCH
	endif # !my_skip_secondary_arch \|\| LOCAL_MULTILIB		endif # !my_skip_non_preferred_arch \|\| LOCAL_MULTILIB
	LOCAL_2ND_ARCH_VAR_PREFIX :=		LOCAL_2ND_ARCH_VAR_PREFIX :=
	LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=		LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=

core/module_arch_supported.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,12 +25,16 @@ endif
	ifeq ($(LOCAL_2ND_ARCH_VAR_PREFIX),)		ifeq ($(LOCAL_2ND_ARCH_VAR_PREFIX),)
	ifeq ($(TARGET_IS_64_BIT)\|$(my_module_multilib),true\|32)		ifeq ($(TARGET_IS_64_BIT)\|$(my_module_multilib),true\|32)
	my_module_arch_supported := false		my_module_arch_supported := false
			else ifeq ($(TARGET_IS_64_BIT)\|$(my_module_multilib),\|64)
			my_module_arch_supported := false
	else ifeq ($(call directory_is_64_bit_blacklisted,$(LOCAL_PATH)),true)		else ifeq ($(call directory_is_64_bit_blacklisted,$(LOCAL_PATH)),true)
	my_module_arch_supported := false		my_module_arch_supported := false
	endif		endif
	else # LOCAL_2ND_ARCH_VAR_PREFIX		else # LOCAL_2ND_ARCH_VAR_PREFIX
	ifeq ($(my_module_multilib),first)		ifeq ($(my_module_multilib),first)
	my_module_arch_supported := false		my_module_arch_supported := false
			else ifeq ($(my_module_multilib),64)
			my_module_arch_supported := false
	endif		endif
	endif # LOCAL_2ND_ARCH_VAR_PREFIX		endif # LOCAL_2ND_ARCH_VAR_PREFIX

core/multilib.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ else ifeq ($(LOCAL_NO_2ND_ARCH),true)
	my_module_multilib := first		my_module_multilib := first
	endif		endif
	else # my_module_multilib defined		else # my_module_multilib defined
	ifeq (,$(filter 32 first both none,$(my_module_multilib)))		ifeq (,$(filter 32 64 first both none,$(my_module_multilib)))
	$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE))		$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE))
	endif		endif
	endif # my_module_multilib defined		endif # my_module_multilib defined

core/package.mk

+47 −6

Original line number	Original line	Diff line number	Diff line
	@@ -5,23 +5,64 @@

	include $(BUILD_SYSTEM)/multilib.mk		include $(BUILD_SYSTEM)/multilib.mk

	ifndef my_module_multilib		ifeq ($(TARGET_SUPPORTS_32_BIT_APPS)\|$(TARGET_SUPPORTS_64_BIT_APPS),true\|true)
	# packages default to building for either architecture,		# packages default to building for either architecture,
	# the first if its supported, otherwise the second.		# the preferred if its supported, otherwise the non-preferred.
	my_module_multilib := both		else ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
			# only 64-bit apps supported
			ifeq ($(filter $(my_module_multilib),64 both first),$(my_module_multilib))
			# if my_module_multilib was 64, both, first, or unset, build for 64-bit
			my_module_multilib := 64
			else
			# otherwise don't build this app
			my_module_multilib := none
			endif
			else
			# only 32-bit apps supported
			ifeq ($(filter $(my_module_multilib),32 both),$(my_module_multilib))
			# if my_module_multilib was 32, both, or unset, build for 32-bit
			my_module_multilib := 32
			else ifeq ($(my_module_multilib),first)
			ifndef TARGET_IS_64_BIT
			# if my_module_multilib was first and this is a 32-bit build, build for
			# 32-bit
			my_module_multilib := 32
			else
			# if my_module_multilib was first and this is a 64-bit build, don't build
			# this app
			my_module_multilib := none
			endif
			else
			# my_module_mulitlib was 64 or none, don't build this app
			my_module_multilib := none
			endif
	endif		endif

	LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true		LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true

	# check if first arch is supported		# if TARGET_PREFER_32_BIT is set, try to build 32-bit first
			ifdef TARGET_2ND_ARCH
			ifeq ($(TARGET_PREFER_32_BIT),true)
			LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
			else
	LOCAL_2ND_ARCH_VAR_PREFIX :=		LOCAL_2ND_ARCH_VAR_PREFIX :=
			endif
			endif

			# check if preferred arch is supported
	include $(BUILD_SYSTEM)/module_arch_supported.mk		include $(BUILD_SYSTEM)/module_arch_supported.mk
	ifeq ($(my_module_arch_supported),true)		ifeq ($(my_module_arch_supported),true)
	# first arch is supported		# first arch is supported
	include $(BUILD_SYSTEM)/package_internal.mk		include $(BUILD_SYSTEM)/package_internal.mk
	else ifneq (,$(TARGET_2ND_ARCH))		else ifneq (,$(TARGET_2ND_ARCH))
	# check if secondary arch is supported		# check if the non-preferred arch is the primary or secondary
			ifeq ($(TARGET_PREFER_32_BIT),true)
			LOCAL_2ND_ARCH_VAR_PREFIX :=
			else
	LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)		LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
			endif

			# check if non-preferred arch is supported
	include $(BUILD_SYSTEM)/module_arch_supported.mk		include $(BUILD_SYSTEM)/module_arch_supported.mk
	ifeq ($(my_module_arch_supported),true)		ifeq ($(my_module_arch_supported),true)
	# secondary arch is supported		# secondary arch is supported