Snap for 9713123 from ae9c6b1c187af389430df22a11d0742d89517cc3 to simpleperf-release

Change-Id: Idf3cde4659342f1263a1ee37e4ec5b3ea5445b3d

1 files changed, 6 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 19fa440..2867a0d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,12 +36,17 @@ java_library_static {
     name: "android-key-attestation",
     visibility: [
         "//cts/tests/tests/keystore",
+        "//cts/common/device-side/device-info",
     ],
+    min_sdk_version: "31",
+    dxflags: ["--multi-dex"],
     srcs: ["server/src/main/java/**/*.java"],
     exclude_srcs: ["server/src/main/java/**/KeyAttestationExample.java"],
     sdk_version: "current",
-    libs: [
+    static_libs: [
         "bouncycastle-unbundled",
+    ],
+    libs: [
         "wycheproof-gson",
     ],
 }