commit 655935d625c2b296df08021896c70d89142ecb5e
author Krzysztof Kosiński <krzysio@google.com> Mon Oct 02 21:05:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 02 21:05:36 2023 +0000
tree 7e9d8c10acdcdb6b1e01426d609c4db191ed21ec
parent 7c42f166bbbfc7e105348d9cda5dc0049ca63014
parent 2ce17ff6edc3c7a55e8eecc63d1361e1582e4d3c

Use Gson built from source. am: 829619986f am: 6b78ebc76d am: 2ce17ff6ed

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

Change-Id: I7ce626af2769d145f5d95418dd8097574d66b8f1
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 303076e..6a6e518 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,10 +45,10 @@
     sdk_version: "current",
     static_libs: [
         "bouncycastle-unbundled",
-	"error_prone_annotations",
-	"guava",
+        "error_prone_annotations",
+        "guava",
     ],
     libs: [
-        "wycheproof-gson",
+        "gson",
     ],
 }