Keystore: Json based test added in keystore-wycheproof CTS am: 4bbcbb5127 am: a5d2e5ed66 am: 6fba06c478

Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2020576

Change-Id: If5beaf16e42eee03fbf4d6281ff4d61ceb0af7c8

1 files changed, 11 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 7692b25..8720625 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,8 +40,8 @@ java_library_static {
     ],
     srcs: ["java/**/*.java"],
     exclude_srcs: [
-        "java/com/google/security/wycheproof/SpongyCastleTest.java",
         "java/com/google/security/wycheproof/SpongyCastleAllTests.java",
+        "java/com/google/security/wycheproof/SpongyCastleTest.java",
     ],
     sdk_version: "current",
     libs: [
@@ -56,11 +56,19 @@ java_library_static {
     visibility: [
         "//cts/tests/tests/keystore",
     ],
-    srcs: ["keystore-cts-src/**/*.java"],
+    srcs: ["keystore-cts/java/**/*.java"],
+    java_resource_dirs: ["keystore-cts/testvectors"],
     sdk_version: "current",
     libs: [
-        "bouncycastle-unbundled",
         "bouncycastle-bcpkix-unbundled",
+        "bouncycastle-unbundled",
         "junit",
+        "wycheproof-gson",
     ],
 }
+
+java_import {
+    name: "wycheproof-gson",
+    visibility: ["//cts/tests/tests/keystore"],
+    jars: ["keystore-cts/libs/gson-2.9.0.jar"],
+}