commit b52566c2ba5fe4a46fa40c71411093e6b9b851ba
author SzuWei Lin <szuweilin@google.com> Fri Jan 19 04:31:46 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 19 04:31:46 2018 +0000
tree ce9ceb6476a67e2bedfa613c991994baa50b334f
parent e0b06020f869ee5761d7153bf6b623a42a4d487a
parent 469aafe421aa9320ffc1a80ac2be9b74126fee23

Merge "Normalize the 2nd CPU architect of 64 bits arm GSI"
am: 469aafe421

Change-Id: Ie699b5c68229b5dec683125976ffec3f6adbb55f

target/board/generic_arm64_a/BoardConfig.mk

diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk
index 8f4043f..34a8ac0 100644
--- a/target/board/generic_arm64_a/BoardConfig.mk
+++ b/target/board/generic_arm64_a/BoardConfig.mk
@@ -23,7 +23,7 @@
 TARGET_CPU_VARIANT := generic
 
 TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
+TARGET_2ND_ARCH_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a15
+TARGET_2ND_CPU_VARIANT := generic

target/board/generic_arm64_ab/BoardConfig.mk

diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
index e0d7372..00afee6 100644
--- a/target/board/generic_arm64_ab/BoardConfig.mk
+++ b/target/board/generic_arm64_ab/BoardConfig.mk
@@ -23,10 +23,10 @@
 TARGET_CPU_VARIANT := generic
 
 TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
+TARGET_2ND_ARCH_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a15
+TARGET_2ND_CPU_VARIANT := generic
 
 # Enable A/B update
 TARGET_NO_RECOVERY := true