Snap for 9690662 from efafde9d2a65e02b51f8aef6372d271de400f660 to udc-releaseandroid-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release

Change-Id: I56b1799c5e87eb9cebb766f7d1372381bd40f322

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",
     ],
 }