Merge "Use NEON for CTS/SDK/VTS builds too (64-bit edition)." (2818d925) · Commits · e / os / android_build

target/board/generic_arm64/BoardConfig.mk

+5 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ TARGET_2ND_ARCH := arm
		TARGET_2ND_CPU_ABI := armeabi-v7a
		TARGET_2ND_CPU_ABI2 := armeabi

		ifneq ($(TARGET_BUILD_APPS)$(filter cts vts sdk,$(MAKECMDGOALS)),)
		ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk vts,$(MAKECMDGOALS)),)
		# DO NOT USE
		# DO NOT USE
		#
		@@ -41,7 +41,11 @@ ifneq ($(TARGET_BUILD_APPS)$(filter cts vts sdk,$(MAKECMDGOALS)),)
		#
		# DO NOT USE
		# DO NOT USE
		ifneq ($(filter cts sdk vts,$(MAKECMDGOALS)),)
		TARGET_2ND_ARCH_VARIANT := armv7-a-neon
		else
		TARGET_2ND_ARCH_VARIANT := armv7-a
		endif
		# DO NOT USE
		# DO NOT USE
		TARGET_2ND_CPU_VARIANT := generic