commit f2b4ecfbb24ba68560cd44a5bb552512f61a690d
author Aditya Choudhary <caditya@google.com> Mon Feb 12 23:21:12 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 12 23:21:12 2024 +0000
tree 97b3d061ce037709caf040a31481263b23a4e54c
parent 9d4f2cb16337e136edde1140f08bc14163a10c4c
parent 7b48f2d949c0a84481aad74d119f45c1e8adc220

Migrate Test Targets to New Android Ownership Model am: 7b48f2d949

Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2944253

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

device.mk

diff --git a/device.mk b/device.mk
index b9e18ec..ca016bc 100644
--- a/device.mk
+++ b/device.mk
@@ -932,7 +932,7 @@
 -include hardware/google/pixel/mm/device_legacy.mk
 
 # thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
 
 # Pixel Logger
 include hardware/google/pixel/PixelLogger/PixelLogger.mk

device_framework_matrix_product.xml

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index df333e8..d23db0f 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -42,7 +42,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>2</version>
+        <version>2-3</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
@@ -212,7 +212,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>

usb/usb/Android.bp

diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index c83f9c4..6f891bb 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -38,7 +38,7 @@
         "android.hardware.usb.gadget@1.0",
         "android.hardware.usb-V1-ndk",
         "libcutils",
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
         "libbinder_ndk",
 
@@ -48,7 +48,7 @@
         "libpixelstats",
     ],
     export_shared_lib_headers: [
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
     ],
 }