commit 3c32192c7e853c8feb8d03a78258f15d2b7f736f
author Krzysztof Kosiński <krzysio@google.com> Wed Nov 08 07:10:23 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 08 07:10:23 2023 +0000
tree 7a4f22825917c497fcbf7ee5fc09699028245d51
parent 8e03e1b93e06dff572116e770e1fad6a1093d1e0
parent d9e2b199c7f91ab691e7059c89925894042a8477

Remove Pixel 4 namespaces from Pixel 5. am: bc9c97afaa am: 688276eb79 am: d9e2b199c7

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

Change-Id: I7c9329d5e757a0bac031e0c62272bde149a9423e
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 971e9b7..c61fc04 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -432,7 +432,7 @@
 
 # NFC and Secure Element packages
 PRODUCT_PACKAGES += \
-    com.android.nfcservices \
+    NfcNci \
     Tag \
     SecureElement \
     android.hardware.nfc-service.st \
@@ -1031,7 +1031,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>