Make blueline use generic arch variant
This makes the system image more generic. The intent is so to
add another set of flags to allow the vendor partition to compile with
more specific flags once the build system can support that.
Only blueline for now, so that we can compare perf to crosshatch.
Bug: 120773446
Test: various benchmarks
Test: boot blueline
Change-Id: I512d0779a8462e163a93b88482d4f7cd4791db0b
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 8beed4f..3d791b1 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -20,31 +20,31 @@
TARGET_NO_BOOTLOADER := true
TARGET_ARCH := arm64
-ifeq (,$(filter %_mainline,$(TARGET_PRODUCT)))
-TARGET_ARCH_VARIANT := armv8-2a
-else
+ifneq (,$(filter %_mainline blueline%,$(TARGET_PRODUCT)))
TARGET_ARCH_VARIANT := armv8-a
+else
+TARGET_ARCH_VARIANT := armv8-2a
endif
TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_ABI2 :=
-ifeq (,$(filter %_mainline,$(TARGET_PRODUCT)))
-TARGET_CPU_VARIANT := kryo385
-else
+ifneq (,$(filter %_mainline blueline%,$(TARGET_PRODUCT)))
TARGET_CPU_VARIANT := generic
+else
+TARGET_CPU_VARIANT := kryo385
endif
TARGET_2ND_ARCH := arm
-ifeq (,$(filter %_mainline,$(TARGET_PRODUCT)))
-TARGET_2ND_ARCH_VARIANT := armv8-2a
-else
+ifneq (,$(filter %_mainline 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
-ifeq (,$(filter %_mainline,$(TARGET_PRODUCT)))
-TARGET_2ND_CPU_VARIANT := kryo385
-else
+ifneq (,$(filter %_mainline blueline%,$(TARGET_PRODUCT)))
TARGET_2ND_CPU_VARIANT := generic
+else
+TARGET_2ND_CPU_VARIANT := kryo385
endif
TARGET_BOARD_COMMON_PATH := device/google/crosshatch/sdm845
