commit efafde9d2a65e02b51f8aef6372d271de400f660
author Shaquille Johnson <ssjohnson@google.com> Fri Mar 03 19:40:44 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 03 19:40:44 2023 +0000
tree 397781575ce061ba10ab5fbafaa35f32b8300ec5
parent 32f465b1b7acc1696e0e3bc27991347250c98258
parent eed93b135df31da51c0e559d170e61a7b7f5b8c9

Fix static libs to link bouncycastle am: ae9c6b1c18 am: 944945e11f am: eed93b135d

Original change: https://android-review.googlesource.com/c/platform/external/android-key-attestation/+/2432333

Change-Id: I1faacad0ad2e7428523d501e9f5f5082f82dbc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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