commit 4e0f683c26a25bb60e7044cf6a73ca350ccd6ac5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 08 15:31:19 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 08 15:31:19 2023 +0000
tree 397781575ce061ba10ab5fbafaa35f32b8300ec5
parent 58ff10ea490a3c58af1269872c3c15efdf2a4db6
parent fe49b0ade418275476b25abadf83903c9506ff7d

Snap for 9710098 from fe49b0ade418275476b25abadf83903c9506ff7d to mainline-tzdata5-release

Change-Id: I02fc76b7b6c2408caa027d57c5fd79c3f781c906

Android.bp

diff --git a/Android.bp b/Android.bp
index c8802a6..2867a0d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,19 +16,37 @@
 
 package {
     default_visibility: ["//visibility:private"],
+    default_applicable_licenses: ["external_android-key-attestation_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_android-key-attestation_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
 }
 
 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",
     ],
 }
-