From b7f28608e5810a070bd6df58ad201bd6e1d48b4b Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 8 Oct 2023 22:22:16 +0300
Subject: [PATCH] LineageOS 21.0

Change-Id: Ibb75018049d2a0461a2b2fdccb509347c0d9834b
---
 config/version.mk                           |  2 +-
 prebuilt/common/bin/backuptool.sh           |  2 +-
 prebuilt/common/bin/backuptool_ab.functions |  2 +-
 prebuilt/common/bin/backuptool_ab.sh        |  2 +-
 vars/common                                 | 16 ++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/version.mk b/config/version.mk
index 0d15a03e..9fb74174 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -1,4 +1,4 @@
-PRODUCT_VERSION_MAJOR = 20
+PRODUCT_VERSION_MAJOR = 21
 PRODUCT_VERSION_MINOR = 0
 
 ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 1e29554d..98156b69 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -6,7 +6,7 @@
 export C=/tmp/backupdir
 export SYSDEV="$(readlink -nf "$2")"
 export SYSFS="$3"
-export V=20.0
+export V=21.0
 
 export ADDOND_VERSION=3
 
diff --git a/prebuilt/common/bin/backuptool_ab.functions b/prebuilt/common/bin/backuptool_ab.functions
index d67cc599..60451cda 100644
--- a/prebuilt/common/bin/backuptool_ab.functions
+++ b/prebuilt/common/bin/backuptool_ab.functions
@@ -5,7 +5,7 @@
 
 export S=/system
 export C=/postinstall/tmp/backupdir
-export V=20.0
+export V=21.0
 export backuptool_ab=true
 
 copy_file() {
diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index 02e89d65..140efeb8 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -5,7 +5,7 @@
 
 export S=/system
 export C=/postinstall/tmp/backupdir
-export V=20.0
+export V=21.0
 
 export ADDOND_VERSION=3
 
diff --git a/vars/common b/vars/common
index 6a976067..2d433d86 100644
--- a/vars/common
+++ b/vars/common
@@ -1,15 +1,15 @@
 # Entire file updated manually
-readonly android_version=13 # For update-build-desc-fingerprint.sh
-readonly aosp_tag_match=android-13.0 # For update-device-vars.sh
+readonly android_version=14 # For update-build-desc-fingerprint.sh
+readonly aosp_tag_match=android-14.0 # For update-device-vars.sh
 
-readonly os_branch=lineage-20.0
-readonly device_branch=lineage-20
+readonly os_branch=lineage-21.0
+readonly device_branch=lineage-21
 
-readonly prev_common_aosp_tag=android-13.0.0_r67 # Aug 2023, Pixel 4a - 7a
-readonly common_aosp_tag=android-13.0.0_r75 # Sep 2023
+readonly prev_common_aosp_tag=android-13.0.0_r75 # Sep 2023
+readonly common_aosp_tag=android-14.0.0_r1 # Oct 2023, Pixel 4a (5G) - 7a
 
-readonly common_aosp_build_id=TQ3A.230905.001 # Sep 2023, Pixel 4a (5G) - 7a
+readonly common_aosp_build_id=UP1A.231005.007 # Oct 2023, Pixel 4a (5G) - 7a
 
-readonly topic=T_asb_2023-09
+readonly topic=U_asb_2023-10
 
 readonly merge_method="merge"