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

Commit 3c22ddff authored Dec 16, 2020 by Anton Hansson Committed by Automerger Merge Worker Dec 16, 2020

Merge "Add make support for Aml_abis and Ndk_abis options" am: e47d6e4a

Original change: https://android-review.googlesource.com/c/platform/build/+/1512775

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d786f3557450d684eaf12a71a7e6f238ee9b36a

parents 7f8a07e6 e47d6e4a

core/board_config.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -55,6 +55,10 @@ _board_strip_readonly_list += TARGET_2ND_CPU_ABI
	_board_strip_readonly_list += TARGET_2ND_CPU_ABI2		_board_strip_readonly_list += TARGET_2ND_CPU_ABI2
	_board_strip_readonly_list += TARGET_2ND_CPU_VARIANT		_board_strip_readonly_list += TARGET_2ND_CPU_VARIANT
	_board_strip_readonly_list += TARGET_2ND_CPU_VARIANT_RUNTIME		_board_strip_readonly_list += TARGET_2ND_CPU_VARIANT_RUNTIME
			# TARGET_ARCH_SUITE is an alternative arch configuration to TARGET_ARCH (and related variables),
			# that can be used for soong-only builds to build for several architectures at once.
			# Allowed values currently are "ndk" and "mainline_sdk".
			_board_strip_readonly_list += TARGET_ARCH_SUITE

	# File system variables		# File system variables
	_board_strip_readonly_list += BOARD_FLASH_BLOCK_SIZE		_board_strip_readonly_list += BOARD_FLASH_BLOCK_SIZE

core/main.mk

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -115,6 +115,11 @@ SKIP_BOOT_JARS_CHECK := true
	endif		endif
	endif		endif

			ifdef TARGET_ARCH_SUITE
			# TODO(b/175577370): Enable this error.
			# $(error TARGET_ARCH_SUITE is not supported in kati/make builds)
			endif

	# ADDITIONAL_<partition>_PROPERTIES are properties that are determined by the		# ADDITIONAL_<partition>_PROPERTIES are properties that are determined by the
	# build system itself. Don't let it be defined from outside of the core build		# build system itself. Don't let it be defined from outside of the core build
	# system like Android.mk or <product>.mk files.		# system like Android.mk or <product>.mk files.

core/soong_config.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,9 @@ $(call add_json_str, DeviceSecondaryArchVariant, $(TARGET_2ND_ARCH_VARIA
	$(call add_json_str, DeviceSecondaryCpuVariant, $(TARGET_2ND_CPU_VARIANT))		$(call add_json_str, DeviceSecondaryCpuVariant, $(TARGET_2ND_CPU_VARIANT))
	$(call add_json_list, DeviceSecondaryAbi, $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2))		$(call add_json_list, DeviceSecondaryAbi, $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2))

			$(call add_json_bool, Aml_abis, $(if $(filter mainline_sdk,$(TARGET_ARCH_SUITE)),true))
			$(call add_json_bool, Ndk_abis, $(if $(filter ndk, $(TARGET_ARCH_SUITE)),true))

	$(call add_json_str, NativeBridgeArch, $(TARGET_NATIVE_BRIDGE_ARCH))		$(call add_json_str, NativeBridgeArch, $(TARGET_NATIVE_BRIDGE_ARCH))
	$(call add_json_str, NativeBridgeArchVariant, $(TARGET_NATIVE_BRIDGE_ARCH_VARIANT))		$(call add_json_str, NativeBridgeArchVariant, $(TARGET_NATIVE_BRIDGE_ARCH_VARIANT))
	$(call add_json_str, NativeBridgeCpuVariant, $(TARGET_NATIVE_BRIDGE_CPU_VARIANT))		$(call add_json_str, NativeBridgeCpuVariant, $(TARGET_NATIVE_BRIDGE_CPU_VARIANT))