From 61fc2f7e1ae93659b72b78e6739c8b2505ea9344 Mon Sep 17 00:00:00 2001
From: Wilson Sung <wilsonsung@google.com>
Date: Tue, 24 Dec 2024 19:11:12 -0800
Subject: [PATCH 1/2] tegu: Update SVN to 2

Flag: build.RELEASE_SVN_TEGU
Bug: 383638176
Test: boot
(cherry picked from commit d53b263bfbe0e432229503aa508a6087e8a7fb45)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d88eee4e8711a7194d7f9d63fd6697cfcfabdca4)
Merged-In: Ibc84d73b0e1a496872b8d904b91655fc2cfb28ec
Change-Id: Ibc84d73b0e1a496872b8d904b91655fc2cfb28ec
---
 device-tegu.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/device-tegu.mk b/device-tegu.mk
index 0d6b180..f350786 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -434,3 +434,17 @@ PRODUCT_COPY_FILES += \
 #Component Override for Pixel Troubleshooting App
 PRODUCT_COPY_FILES += \
     device/google/tegu/tegu-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tegu-component-overrides.xml
+
+# Enable APF by default
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.powerhal.apf_disabled=false \
+    vendor.powerhal.apf_enabled=true
+
+# Increment the SVN for any official public releases
+ifdef RELEASE_SVN_TEGU
+TARGET_SVN ?= $(RELEASE_SVN_TEGU)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 2
+endif
+

From 2a6c7bfa5cec865e361b5f8197380596ac0dacee Mon Sep 17 00:00:00 2001
From: Wilson Sung <wilsonsung@google.com>
Date: Wed, 25 Dec 2024 22:23:00 -0800
Subject: [PATCH 2/2] tegu: Set ro.vendor.build.svn

Flag: build.RELEASE_SVN_TEGU
Bug: 383638176
Test: boot
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e44e860da6277f4f857aef5dd0daa3d161461ec4)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:84a108c3a67b8fc7d5f58c54922fb63a21ca4f7c)
Merged-In: I7d32a1060900095d80bab11a88965feac15537aa
Change-Id: I7d32a1060900095d80bab11a88965feac15537aa
---
 device-tegu.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/device-tegu.mk b/device-tegu.mk
index f350786..5d6e785 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -435,11 +435,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     device/google/tegu/tegu-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tegu-component-overrides.xml
 
-# Enable APF by default
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.powerhal.apf_disabled=false \
-    vendor.powerhal.apf_enabled=true
-
 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_TEGU
 TARGET_SVN ?= $(RELEASE_SVN_TEGU)
@@ -448,3 +443,8 @@ else
 TARGET_SVN ?= 2
 endif
 
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.vendor.build.svn=$(TARGET_SVN)
+
+
+