commit e00c96e70a75a9ca455d13471eb9d0cda4764c0c
author Bassem Khalife <bkhalife@google.com> Wed Aug 30 21:48:03 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 30 21:48:03 2023 +0000
tree 195bf2981222d496146b048a264783c7daa56678
parent ee3f192668c9dda2e43a25014d5378042cc2eb55
parent 265aff4de70bb01ac44869b156e180e136b45a7b

Update redbull SVN to  73 am: a3abb414f9 am: 68009b1bcb am: b4b998c198 am: 265aff4de7

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull/+/24595435

Change-Id: I292908628f5aead3026138741e3daa1627f5ba7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 356a16a..d4505e9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -845,7 +845,7 @@
 # Increment the SVN for any official public releases
 ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),)
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=73
+	ro.vendor.build.svn=74
 endif
 
 # Enable iwlan service logging for debug
@@ -1034,7 +1034,7 @@
 -include hardware/google/pixel/pixelstats/device.mk
 
 # thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
 
 # power HAL
 -include hardware/google/pixel/power-libperfmgr/aidl/device.mk

device_framework_matrix_product.xml

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 2401dd7..5860544 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -222,7 +222,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1</version>
+        <version>2-3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>