From 53a5581430fe603f42fdaeae8290f3a7e5a5539d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 10 Jan 2019 08:53:38 -0800 Subject: [PATCH] Use NEON for CTS/SDK/VTS builds too (64-bit edition). It's 2019 and the CDD has required NEON for many years now. I've left unbundled apps alone for now. I think the recent fix here for https://issuetracker.google.com/116070933 was incorrect. (I've commented on the bug.) Test: treehugger Change-Id: Ia02305cfdff9fd18a85359bc44d8eb9cab1413bd --- target/board/generic_arm64/BoardConfig.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 1b6429c31b..3331d1827e 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -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