commit 444230b3c8f42d264f687e7f48c6ee6a5cd4f7e4
author Steven Moreland <smoreland@google.com> Mon Mar 06 12:50:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 06 12:50:13 2023 +0000
tree ea0591d6f228e6d3fe020a5645e49cf3f5b06a4c
parent febcb161046b4c27298d1d6feb20aac766d1f291
parent 6d9574198b7ed719161297c1dc472d0143f4f031

Merge "Add missing header" am: 4a6fd93492 am: 4db3c410b9 am: 6d9574198b

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

Change-Id: I1f774f6cb4ad903cc7b49dc5948b1360965c6fa7
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>