commit 42aa39292f004c5ae93d0cdd45b1605590a1e233
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 25 04:16:14 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 25 04:16:14 2024 +0000
tree b75f372cbccb4fb1d2464aa5a35a2ba0072bbf1e
parent 76590c60cc1a6075b737627cd74a6d859fa8481c
parent 6eaf070be5b8f7043340f387d9dce84ec34d779b

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27587856', 'googleplex-android-review.googlesource.com/26816500', 'googleplex-android-review.googlesource.com/28295752'] into 24Q3-release.

Change-Id: I4c09fd94d8b6eb4050276f4484ae96128d8149f0

device-bluejay.mk

diff --git a/device-bluejay.mk b/device-bluejay.mk
index 2636f8d..f5ee9ac 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -129,8 +129,15 @@
     device/google/bluejay
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_BLUEJAY
+TARGET_SVN ?= $(RELEASE_SVN_BLUEJAY)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 64
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=62
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \