Make crosshatch use generic arch variant

Follow blueline which has not demonstrated any regressions
after switching to a generic arch variant.

Bug: 120773446
Test: make
Change-Id: I9e23963fcfa5ccaa912f2930a632458c4d2a692d

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 23fac14..2d714e1 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -21,32 +21,16 @@
 TARGET_USES_VULKAN := true
 
 TARGET_ARCH := arm64
-ifneq (,$(filter %_mainline blueline% %blueline,$(TARGET_PRODUCT)))
 TARGET_ARCH_VARIANT := armv8-a
-else
-TARGET_ARCH_VARIANT := armv8-2a
-endif
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
-ifneq (,$(filter %_mainline blueline% %blueline,$(TARGET_PRODUCT)))
 TARGET_CPU_VARIANT := generic
-else
-TARGET_CPU_VARIANT := kryo385
-endif
 
 TARGET_2ND_ARCH := arm
-ifneq (,$(filter %_mainline blueline% %blueline,$(TARGET_PRODUCT)))
 TARGET_2ND_ARCH_VARIANT := armv8-a
-else
-TARGET_2ND_ARCH_VARIANT := armv8-2a
-endif
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-ifneq (,$(filter %_mainline blueline% %blueline,$(TARGET_PRODUCT)))
 TARGET_2ND_CPU_VARIANT := generic
-else
-TARGET_2ND_CPU_VARIANT := kryo385
-endif
 
 TARGET_BOARD_COMMON_PATH := device/google/crosshatch/sdm845