commit 7af01ada853bfaeced663cf6b6fa1b987da26304
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 02 10:13:28 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 02 10:13:28 2019 +0000
tree 8342466c5bb9cb8aeb208a1eeaeaee58f26abc5f
parent d64f48a5041578c1b18d12024ae3b2a8862b453d
parent b01ce9644e3e46600143953905a9b53c0de37887

Merge "Document that quantized PAD behavior is undefined before NNAPI 1.2" into qt-dev

broadcastradio/common/tests/Android.bp

diff --git a/broadcastradio/common/tests/Android.bp b/broadcastradio/common/tests/Android.bp
index ef8733c..0ace941 100644
--- a/broadcastradio/common/tests/Android.bp
+++ b/broadcastradio/common/tests/Android.bp
@@ -58,6 +58,7 @@
         "android.hardware.broadcastradio@common-utils-2x-lib",
     ],
     shared_libs: [
+        "libhidlbase",
         "android.hardware.broadcastradio@2.0",
     ],
     test_suites: ["general-tests"],

compatibility_matrices/compatibility_matrix.4.xml

diff --git a/compatibility_matrices/compatibility_matrix.4.xml b/compatibility_matrices/compatibility_matrix.4.xml
index 6c28761..7d6fc60 100644
--- a/compatibility_matrices/compatibility_matrix.4.xml
+++ b/compatibility_matrices/compatibility_matrix.4.xml
@@ -181,7 +181,12 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.gnss</name>
-        <version>1.0-1</version>
+        <!--
+         - Both versions are listed here as a workaround for libvintf since 2.0 extends 1.1.
+         - Devices launched with Q must support gnss@2.0, see VtsTrebleVendorVintfTest
+         - test DeviceManifestTest#GnssHalVersionCompatibility.
+        -->
+        <version>1.1</version>
         <version>2.0</version>
         <interface>
             <name>IGnss</name>