diff options
| author | Xin Li <delphij@google.com> | 2024-01-17 22:13:14 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-17 22:13:14 -0800 |
| commit | 9d4f2cb16337e136edde1140f08bc14163a10c4c (patch) | |
| tree | e8d074f11bf64932cac3f88d88d5db04c84f918a | |
| parent | 23d9fcf9b3f34eab5140b32e4255c7594aa5489a (diff) | |
| parent | bdb2183763a2ea570bf325efa0eea82569fdb47a (diff) | |
| download | sunfish-9d4f2cb16337e136edde1140f08bc14163a10c4c.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I9028f8eae1d973d0f9b7553a6adf9525b56766c9
Change-Id: I46b3d8fe6840571221df2479591cf7800382c8a1
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | device_framework_matrix_product.xml | 4 | ||||
| -rw-r--r-- | usb/usb/Android.bp | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -932,7 +932,7 @@ include hardware/google/pixel/citadel/citadel.mk -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 diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index df333e8b..d23db0f9 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> diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index c83f9c4c..6f891bb7 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -38,7 +38,7 @@ cc_binary { "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 @@ cc_binary { "libpixelstats", ], export_shared_lib_headers: [ - "android.frameworks.stats-V1-ndk", + "android.frameworks.stats-V2-ndk", "pixelatoms-cpp", ], } |