From b279a1ac966c8e2af4e909ee1635525299967041 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Thu, 30 May 2024 00:05:17 +0000
Subject: [PATCH 1/3] Update felix SVN to 53

Bug: 342381152
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bc25286b64b9c867c3638196002a7b70ac69ac62)
Merged-In: I21048d04ff40b1237bcf3d8258b3a3263394fe42
Change-Id: I21048d04ff40b1237bcf3d8258b3a3263394fe42
---
 device-felix.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-felix.mk b/device-felix.mk
index 199e2c9..cc75c91 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -218,7 +218,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=52
+    ro.vendor.build.svn=53
 
 # Vibrator HAL
 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))

From 0235c55b83821f9b3bac0606554b60ab86cd2a57 Mon Sep 17 00:00:00 2001
From: Lokesh Kumar Goel <lokeshgoel@google.com>
Date: Thu, 4 Apr 2024 00:12:08 +0000
Subject: [PATCH 2/3] felix: Use build_flags for SVN

Flag: build.RELEASE_SVN_FELIX
Bug: 332726030
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:87907f0071ae7ec6f81de189bf895d4fc6eee494)
Merged-In: Icdf9198885ba0fa9c02bd161e2b2ff45927aa8a0
Change-Id: Icdf9198885ba0fa9c02bd161e2b2ff45927aa8a0
---
 device-felix.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/device-felix.mk b/device-felix.mk
index cc75c91..0fc65b2 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -217,8 +217,15 @@ PRODUCT_SOONG_NAMESPACES += \
     device/google/felix
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_FELIX
+TARGET_SVN ?= $(RELEASE_SVN_FELIX)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 53
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=53
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # Vibrator HAL
 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))

From 411eed6900f8318aba73048e54c0d4a2d6c0e224 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Mon, 15 Jul 2024 14:17:29 +0000
Subject: [PATCH 3/3] Update felix SVN to 54

Bug:352170103
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:36015c810ee6ebe7cc9a9b2dad3e9b85ccae47ab)
Merged-In: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
Change-Id: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
---
 device-felix.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-felix.mk b/device-felix.mk
index 0fc65b2..a83c16a 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -221,7 +221,7 @@ ifdef RELEASE_SVN_FELIX
 TARGET_SVN ?= $(RELEASE_SVN_FELIX)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 53
+TARGET_SVN ?= 54
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \