commit 6621a2fa8b590ccbd1fb31670af31d2a44bca23f
author Elliott Hughes <enh@google.com> Thu Jan 10 21:23:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 10 21:23:03 2019 +0000
tree 70501075ecc417bf2ee2b880be1ef2fa5a08de23
parent 1951e7041644a350ffc80be9ff5754918cf4b5a3
parent 53a5581430fe603f42fdaeae8290f3a7e5a5539d

Merge "Use NEON for CTS/SDK/VTS builds too (64-bit edition)."

target/board/generic_arm64/BoardConfig.mk

diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk
index 1b6429c..3331d18 100644
--- a/target/board/generic_arm64/BoardConfig.mk
+++ b/target/board/generic_arm64/BoardConfig.mk
@@ -23,7 +23,7 @@
 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 @@
 #
 # 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