commit 637fce74dcf700929d7eebf48ef422a9636a42a2
author Krzysztof Kosiński <krzysio@google.com> Wed Aug 31 22:22:47 2022 +0000
committer Krzysztof Kosiński <krzysio@google.com> Wed Aug 31 22:22:47 2022 +0000
tree e11beb21ea2b4ab7924d6d049f774bbfaa1a6ee3
parent b2e0d45c5bd919a11f5f032171d96abcdd7fb197

Revert "Revert "Revert "Revert "Switch to source-built GSON.""""

This reverts commit b2e0d45c5bd919a11f5f032171d96abcdd7fb197.

Reason for revert: Re-land again. It looks like the manifest change in aosp/2199915 didn't propagate to the tradefed branch yet when I submitted this change last time.

Change-Id: I84a638bcd4af3bae07c9e5b0ec408215db18314a

Android.bp

diff --git a/Android.bp b/Android.bp
index 1e7beaf..9c5ff92 100644
--- a/Android.bp
+++ b/Android.bp
@@ -667,7 +667,7 @@
     ],
     static_libs: [
         "error_prone_annotations",
-        "gson-prebuilt-jar",
+        "gson",
         "guava-21.0",
         "libprotobuf-java-full",
     ],