aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof KosiƄski <krzysio@google.com>2023-10-02 19:55:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-02 19:55:42 +0000
commit38c725e5392f5829d14912f266197b5da30e1655 (patch)
tree1eab338c526fc234b72b65edbd094620df194e8e
parentabea674f7c54310666ca90d6b0bc35afdf77d8c8 (diff)
parent27fe73361c98ff70f62621ca769b1530a22b8b5e (diff)
downloadwycheproof-tmp_amf_298295554.tar.gz
Use Gson built from source. am: 27fe73361ctmp_amf_298295554
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2768309 Change-Id: I93583ac4b1637f15ccab4501e8ed2543ab5c5b5f 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