From 6dbe6b90acf5eab928a54c19f2fdebae9c225cb2 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@gmail.com>
Date: Thu, 13 Jul 2023 16:43:06 +0300
Subject: [PATCH] Use gs201 kernel for gs101 pixels

It's exactly the same

Change-Id: I5e4fc58f1ca82fae03144e156a38b07673e5c128
---
 kernel/build_kernel.sh |  9 ++++-----
 vars/gs101             | 14 --------------
 vars/gs201             |  2 +-
 vars/kernel_repos      |  1 -
 4 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 vars/gs101

diff --git a/kernel/build_kernel.sh b/kernel/build_kernel.sh
index f8111c9..83605b3 100755
--- a/kernel/build_kernel.sh
+++ b/kernel/build_kernel.sh
@@ -70,12 +70,12 @@ select_kernel_config() {
     export KLEAF_SUPPRESS_BUILD_SH_DEPRECATION_WARNING=1
     ;;
   raviole)
-    export DEVICE_KERNEL_BUILD_CONFIG=gs101/private/gs-google/build.config.slider
+    export DEVICE_KERNEL_BUILD_CONFIG=gs201/private/gs-google/build.config.slider
     export BUILD_AOSP_KERNEL=1
     export LTO=full
     ;;
   bluejay)
-    export DEVICE_KERNEL_BUILD_CONFIG=gs101/private/devices/google/bluejay/build.config.bluejay
+    export DEVICE_KERNEL_BUILD_CONFIG=gs201/private/devices/google/bluejay/build.config.bluejay
     export BUILD_AOSP_KERNEL=1
     export LTO=full
     ;;
@@ -110,9 +110,8 @@ select_kernel_config() {
 build_kernel() {
   pushd "${top}"
   # raviole/bluejay/pantah/lynx/tangorpro/felix is built differently, gki
-  if [[ "${kernel}" == "raviole" || "${kernel}" == "bluejay" ]]; then
-    gs101/private/gs-google/build_slider.sh "${@}"
-  elif [[ "${kernel}" == "pantah" || "${kernel}" == "lynx" || "${kernel}" == "tangorpro" || "${kernel}" == "felix" ]]; then
+  if [[ "${kernel}" == "raviole" || "${kernel}" == "bluejay" || "${kernel}" == "pantah" || "${kernel}" == "lynx"
+      || "${kernel}" == "tangorpro" || "${kernel}" == "felix" ]]; then
     gs201/private/gs-google/build_slider.sh "${@}"
   else
     build/build.sh "${@}"
diff --git a/vars/gs101 b/vars/gs101
deleted file mode 100644
index b44896d..0000000
--- a/vars/gs101
+++ /dev/null
@@ -1,14 +0,0 @@
-# Pixel 6, 6 Pro, 6a
-
-# Updated semi-manually via pixel/update-any-var.sh
-
-readonly kernel_branch="android-gs-bluejay-5.10-android13-qpr3"
-
-readonly prev_kernel_tag=android-13.0.0_r0.83 # Jun 2023
-readonly kernel_tag=android-13.0.0_r0.100 # Jul 2023
-
-# Match with version string in commit message of prebuilt kernel
-readonly gki_branch="android13-5.10-2023-02_r9" # Jul 2023
-
-readonly prev_gki_tag=android-13.0.0_r0.83 # Jun 2023
-readonly gki_tag=android-13.0.0_r0.100 # Jul 2023
diff --git a/vars/gs201 b/vars/gs201
index a3dab73..33cddca 100644
--- a/vars/gs201
+++ b/vars/gs201
@@ -1,4 +1,4 @@
-# Pixel 7, 7 Pro, 7a
+# Pixel 6, 6 Pro, 6a, 7, 7 Pro, 7a, Tablet, Fold
 
 # Updated semi-manually via pixel/update-any-var.sh
 
diff --git a/vars/kernel_repos b/vars/kernel_repos
index e776966..f7227b5 100644
--- a/vars/kernel_repos
+++ b/vars/kernel_repos
@@ -1,7 +1,6 @@
 # Usage: ${kernel_repos[@]}
 readonly kernel_repos=(
   kernel/google/gs201/private/gs-google
-  kernel/google/gs101/private/gs-google
   kernel/google/redbull
   kernel/google/msm-4.14
 )