Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320
Merged-In: Iffe880b97e0296047b9e2b9c9929d67d09d257b6
Change-Id: I709803218abf155d4b5b54d2b9114caafaa0cd51
diff --git a/device-oriole.mk b/device-oriole.mk
index f72aefe..7de385a 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -193,8 +193,15 @@
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 ?= 85
+endif
+
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=83
+ 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 a14a304..03b3b44 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -197,8 +197,15 @@
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 ?= 85
+endif
+
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=83
+ ro.vendor.build.svn=$(TARGET_SVN)
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \