From bfa4bc9b4d6ebbd673d3523cfde9de316423ad7f Mon Sep 17 00:00:00 2001
From: Lokesh Kumar Goel <lokeshgoel@google.com>
Date: Thu, 4 Apr 2024 00:07:01 +0000
Subject: [PATCH] raviole: Use build_flags for SVN

Flag: build.RELEASE_SVN_ORIOLE
Flag: build.RELEASE_SVN_RAVEN
Bug: 332726030
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8062fbd55b92f21bfae9671aa1e8e9a0c100780e)
Merged-In: I60035ec95cf07e8e992981a61738aa6f0a6d22ef
Change-Id: I60035ec95cf07e8e992981a61738aa6f0a6d22ef
---
 device-oriole.mk | 9 ++++++++-
 device-raven.mk  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 0b74ed1..03a5834 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -193,8 +193,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 endif
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_ORIOLE
+TARGET_SVN ?= $(RELEASE_SVN_ORIOLE)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 84
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=84
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 8382360..7af865f 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -197,8 +197,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 endif
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_RAVEN
+TARGET_SVN ?= $(RELEASE_SVN_RAVEN)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 84
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=84
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \