commit 140534a783addc84002d631669a466b115e87852
author Gabriel Biren <gbiren@google.com> Thu Jul 13 20:58:29 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 13 20:58:29 2023 +0000
tree a3d2f8ef44162e904b665004c7e83281577fca9d
parent de786e8670b5ea51685fdf6fbf7c760cfd6031b0
parent 1f06b4bf7613fadf1835fa2bba8e6bdf34b470f2

Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into udc-qpr-dev

bluetooth/audio/aidl/vts/Android.bp

diff --git a/bluetooth/audio/aidl/vts/Android.bp b/bluetooth/audio/aidl/vts/Android.bp
index e03fb58..5a604a1 100644
--- a/bluetooth/audio/aidl/vts/Android.bp
+++ b/bluetooth/audio/aidl/vts/Android.bp
@@ -15,11 +15,14 @@
     ],
     tidy_timeout_srcs: ["VtsHalBluetoothAudioTargetTest.cpp"],
     srcs: ["VtsHalBluetoothAudioTargetTest.cpp"],
-    shared_libs: [
+    static_libs: [
         "android.hardware.audio.common-V1-ndk",
         "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.common-V2-ndk",
         "android.hardware.common.fmq-V1-ndk",
+        "android.media.audio.common.types-V2-ndk",
+    ],
+    shared_libs: [
         "libbase",
         "libbinder_ndk",
         "libcutils",

security/keymint/aidl/vts/functional/KeyMintTest.cpp

diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
index bdec4d3..1297d1d 100644
--- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -2086,7 +2086,8 @@
                         builder, &key_blob, &key_characteristics);
             }
         }
-        ASSERT_EQ(error, ErrorCode::CANNOT_ATTEST_IDS);
+
+        device_id_attestation_check_acceptable_error(tag.tag, error);
     }
 }