commit e634bb5904aef846100b9cbb46e2551edd79cd37
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 21 04:04:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 21 04:04:37 2023 +0000
tree 7e9f6dde01f0666380edd43d00908dee04285a23
parent a0bfd7f8ceed12fdcd97f64733c453dd9acff22f
parent 54edddfb8d9970b68f9a26a4bf948b73e46bc8d3

Merge "Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: 2156e0d5ed" into udc-qpr-dev-plus-aosp am: 54edddfb8d

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011

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

usb/usb/Android.bp

diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 80a2824..d9ca00f 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",
     ],
 }

wireless_charger/compatibility_matrix.xml

diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml
index d0adcde..e0e575b 100644
--- a/wireless_charger/compatibility_matrix.xml
+++ b/wireless_charger/compatibility_matrix.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
     <hal format="aidl" optional="true">
         <name>vendor.google.wireless_charger</name>
-        <version>1</version>
+        <version>1-2</version>
         <interface>
             <name>IWirelessCharger</name>
             <instance>default</instance>