diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:29:50 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:50 -0800 |
| commit | 28655f9a45cee65d61e592e561ed2d2146a533e4 (patch) | |
| tree | 97b3d061ce037709caf040a31481263b23a4e54c | |
| parent | 7b48f2d949c0a84481aad74d119f45c1e8adc220 (diff) | |
| parent | f2b4ecfbb24ba68560cd44a5bb552512f61a690d (diff) | |
| download | sunfish-main.tar.gz | |
Bug: 319669529
Merged-In: Ieddd2b23ca8bdd37252a7fe9b8360075ac41a754
Change-Id: I3b9135ec422e40099d8225c3358994cfc8f8b3a3
| -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", ], } |