diff options
author | Xin Li <delphij@google.com> | 2024-03-06 09:29:47 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:47 -0800 |
commit | 3bef04c21715e186d81f18b5f7139c2ef06a31e7 (patch) | |
tree | f262d927c12b6c044307b308b79b505eac59615f | |
parent | 85c74b672eb1a0975b63add5f49654a379c8027d (diff) | |
parent | 788a9550a8889315c5f49b52627116ca330ac029 (diff) | |
download | coral-3bef04c21715e186d81f18b5f7139c2ef06a31e7.tar.gz |
Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I15efa68487a4076f8ab0d243bd1ebe4c124d0a5f
Change-Id: If564175e51c3a03546cccdede8f88b3498dc76a1
-rw-r--r-- | device-coral.mk | 4 | ||||
-rw-r--r-- | device-flame.mk | 4 | ||||
-rw-r--r-- | device.mk | 2 | ||||
-rw-r--r-- | device_framework_matrix_product.xml | 4 | ||||
-rw-r--r-- | usb/usb/Android.bp | 4 |
5 files changed, 5 insertions, 13 deletions
diff --git a/device-coral.mk b/device-coral.mk index 840b48fd..16899f93 100644 --- a/device-coral.mk +++ b/device-coral.mk @@ -37,7 +37,3 @@ PRODUCT_PACKAGES += \ SettingsOverlayG020J \ SettingsOverlayG020P \ SettingsOverlayG020Q \ - -# Setup wizard overlay packages for ActiveEdge -PRODUCT_PACKAGES += \ - PixelSetupWizardOverlayActiveEdge \ diff --git a/device-flame.mk b/device-flame.mk index 621fc397..6f2c8146 100644 --- a/device-flame.mk +++ b/device-flame.mk @@ -40,7 +40,3 @@ PRODUCT_PACKAGES += \ SettingsOverlayG020I_VN \ SettingsOverlayG020M \ SettingsOverlayG020N \ - -# Setup wizard overlay packages for ActiveEdge -PRODUCT_PACKAGES += \ - PixelSetupWizardOverlayActiveEdge \ @@ -1021,7 +1021,7 @@ include hardware/google/pixel/common/pixel-common-device.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include hardware/google/pixel/pixelstats/device.mk include hardware/google/pixel/mm/device_legacy.mk -include hardware/google/pixel/thermal/device.mk +include device/google/gs-common/thermal/thermal_hal/device.mk # gs-common include device/google/gs-common/misc_writer/misc_writer.mk diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index d731591d..6c1e9955 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -52,7 +52,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> @@ -213,7 +213,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 8384ecef..3f4964cc 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", ], } |