Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320
Merged-In: I5793f3fcbd31221a8c47658ad00629bcbf704bc0
Change-Id: I0ef34251c5b5dbe0d64c0efa41a298ca99a48908
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 895dd8f..06adb3d 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -322,8 +322,15 @@
vendor.zram.size=3g
# Increment the SVN for any official public releases
+ifdef RELEASE_SVN_CHEETAH
+TARGET_SVN ?= $(RELEASE_SVN_CHEETAH)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 60
+endif
+
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=58
+ ro.vendor.build.svn=$(TARGET_SVN)
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-panther.mk b/device-panther.mk
index 2ba1948..88a2305 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -305,8 +305,15 @@
vendor.zram.size=3g
# Increment the SVN for any official public releases
+ifdef RELEASE_SVN_PANTHER
+TARGET_SVN ?= $(RELEASE_SVN_PANTHER)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 60
+endif
+
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=58
+ ro.vendor.build.svn=$(TARGET_SVN)
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
