commit 58446a70d34f680142e52fb3e16529a3ea6c0667
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 09 07:22:57 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 09 07:22:57 2022 +0000
tree 5a951652ba59c6b48e5b81148bd90db7a169d98d
parent b04b2a5b514d26ee31b2278b39153a96f718bf80
parent 887a9930a6a0b5954f395376dbf6a139aba72c58

Snap for 8701348 from 887a9930a6a0b5954f395376dbf6a139aba72c58 to mainline-uwb-release

Change-Id: I6040eb3bc17081a3003b1a6f028eaf8ac5839e34

Android.bp

diff --git a/Android.bp b/Android.bp
index c5d129e..2b9e80f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,7 @@
 
 cc_library_headers {
     name: "libhidl_gtest_helper",
+    vendor_available: true,
     host_supported: true,
     export_include_dirs: ["gtest_helper"],
 }
@@ -111,6 +112,9 @@
     ],
     min_sdk_version: "29",
     afdo: true,
+    header_abi_checker: {
+        diff_flags: ["-allow-adding-removing-weak-symbols"],
+    },
 }
 
 // WARNING: deprecated

vintfdata/frozen/6.xml

diff --git a/vintfdata/frozen/6.xml b/vintfdata/frozen/6.xml
index 14ace95..eb078c0 100644
--- a/vintfdata/frozen/6.xml
+++ b/vintfdata/frozen/6.xml
@@ -1,5 +1,9 @@
 <compatibility-matrix version="5.0" type="device">
-    <hal format="hidl" optional="false">
+    <!--
+         cameraserver is installed for all phones and tablets, but not
+         auto or TV.
+    -->
+    <hal format="hidl" optional="true">
         <name>android.frameworks.cameraservice.service</name>
         <version>2.2</version>
         <interface>