commit 25c610798e44c4454076ea4e142d27322eafc696
author Dan Cashman <dcashman@google.com> Thu Apr 20 00:19:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 00:19:18 2017 +0000
tree 44badc5d0683f156200b873be607702ed41d25ca
parent 0883fb75ab5bcd3ba4b73c2cc212afed7ba91a13
parent 59ab9291cd83ffc10a36520da2c0525b82076d42

Merge "Reflect removal of vndservice_manager object classes." into oc-dev
am: 59ab9291cd

Change-Id: I0a5aba17d1e7ef261c9495e6860389cb9c724d04

marlin/BoardConfig.mk

diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 3ef1d14..3232058 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -15,14 +15,13 @@
 TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
-#TODO: add kryo support? TARGET_CPU_VARIANT := kryo
-TARGET_CPU_VARIANT := generic
+TARGET_CPU_VARIANT := kryo
 
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := krait
+TARGET_2ND_CPU_VARIANT := kryo
 
 ENABLE_CPUSETS := true
 

sailfish/BoardConfig.mk

diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index 29ac295..16ad248 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -15,14 +15,13 @@
 TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
-#TODO: add kryo support? TARGET_CPU_VARIANT := kryo
-TARGET_CPU_VARIANT := generic
+TARGET_CPU_VARIANT := kryo
 
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := krait
+TARGET_2ND_CPU_VARIANT := kryo
 
 ENABLE_CPUSETS := true