commit 357c1efb44968cdcb78785bc79cf7795fd47dc33
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Mar 05 00:04:40 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Mar 05 00:04:40 2023 +0000
tree 397781575ce061ba10ab5fbafaa35f32b8300ec5
parent d3460010d3d228b75b928630a0e118245577162a
parent efafde9d2a65e02b51f8aef6372d271de400f660

Snap for 9690662 from efafde9d2a65e02b51f8aef6372d271de400f660 to udc-release

Change-Id: I56b1799c5e87eb9cebb766f7d1372381bd40f322

Android.bp

diff --git a/Android.bp b/Android.bp
index 19fa440..2867a0d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,12 +36,17 @@
     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",
     ],
 }