commit 6ed09c717ff44403c79ec8c0c83e6593f9d816d0
author Steven Moreland <smoreland@google.com> Fri Mar 24 02:39:42 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 24 02:39:42 2023 +0000
tree 374d7dd176ee13a147699b5ddf6d8df329c88ad9
parent 444230b3c8f42d264f687e7f48c6ee6a5cd4f7e4
parent 54cfb333789817e5ad26eceae32f199983857659

TEST_MAPPING += vts_ibase_test am: 9e50a1e3a7 am: 109282f021 am: 54cfb33378

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2506825

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 670ee39..b694886 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,9 +112,6 @@
     ],
     min_sdk_version: "29",
     afdo: true,
-    header_abi_checker: {
-        diff_flags: ["-allow-adding-removing-weak-symbols"],
-    },
 }
 
 // WARNING: deprecated

vintfdata/manifest.xml

diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index b3d84aa..b93205c 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -54,7 +54,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
+    <hal format="hidl" max-level="7">
         <name>android.system.wifi.keystore</name>
         <transport>hwbinder</transport>
         <version>1.0</version>