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

am: 6621a2fa8b

Change-Id: Id730224e68cc7344868c2fd825dfc7ca130f2be1
This commit is contained in:
Elliott Hughes 2019-01-10 13:31:57 -08:00 committed by android-build-merger
commit 2818d925f9
1 changed files with 5 additions and 1 deletions

View File

@ -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