diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 386ebe1..8beed4f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -34,7 +34,11 @@
 endif
 
 TARGET_2ND_ARCH := arm
+ifeq (,$(filter %_mainline,$(TARGET_PRODUCT)))
 TARGET_2ND_ARCH_VARIANT := armv8-2a
+else
+TARGET_2ND_ARCH_VARIANT := armv8-a
+endif
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
 ifeq (,$(filter %_mainline,$(TARGET_PRODUCT)))