aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof KosiƄski <krzysio@google.com>2023-10-02 21:37:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-02 21:37:46 +0000
commita89a6ca7710bc6dda7e12152c35ba1cc833beba8 (patch)
tree1eab338c526fc234b72b65edbd094620df194e8e
parent282a137d291de9ce4b63a55e2c3c1c2f240f77af (diff)
parent54f680e03f6476bab1e64a8201c481b4abac717d (diff)
downloadwycheproof-a89a6ca7710bc6dda7e12152c35ba1cc833beba8.tar.gz
Use Gson built from source. am: 27fe73361c am: 38c725e539 am: bb23e6a924 am: 54f680e03f
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2768309 Change-Id: Iea1f864b349ba7d98d462ab53f8e50c4c5e2d6b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp11
-rw-r--r--keystore-cts/libs/gson-2.9.0.jarbin249277 -> 0 bytes
2 files changed, 1 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index a68f02f..354d934 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,18 +65,9 @@ java_library_static {
"bouncycastle-bcpkix-unbundled",
"bouncycastle-unbundled",
"junit",
- "wycheproof-gson",
+ "gson",
"cts-core-test-runner-axt",
"cts-keystore-test-util",
],
platform_apis: true,
}
-
-java_import {
- name: "wycheproof-gson",
- visibility: [
- "//cts/tests/tests/keystore",
- "//external/android-key-attestation",
- ],
- jars: ["keystore-cts/libs/gson-2.9.0.jar"],
-}
diff --git a/keystore-cts/libs/gson-2.9.0.jar b/keystore-cts/libs/gson-2.9.0.jar
deleted file mode 100644
index fb62e05..0000000
--- a/keystore-cts/libs/gson-2.9.0.jar
+++ /dev/null
Binary files differ