DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for non-A/B devices
The BoardConfig.mk for arm64 non-A/B devices sets
TARGET_2ND_CPU_VARIANT to generic. This causes the generic
C implementation of memmove to be included instead of the optimized
NEON assembler implementation. This implementation is significantly
slower, in some cases enough to cause CTS failures.
The BoardConfig.mk for arm64 A/B correctly sets
TARGET_2ND_CPU_VARIANT to cortex-a15, and the comments in
build/target/board/generic_arm64/BoardConfig.mk make it quite
clear that this is the correct setting.
Bug: 65042524
Test: build with aosp_arm64_a
Change-Id: I3aa7beddc1039b9fe3178740dfdb90858c93dff7
diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk
index 4729744..8f4043f 100644
--- a/target/board/generic_arm64_a/BoardConfig.mk
+++ b/target/board/generic_arm64_a/BoardConfig.mk
@@ -26,4 +26,4 @@
TARGET_2ND_ARCH_VARIANT := armv7-a-neon
TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := generic
+TARGET_2ND_CPU_VARIANT := cortex-a15