commit b39db028c29de6e95c5cc7c7d17f9955927ae791
author Krzysztof Kosiński <krzysio@google.com> Wed Sep 14 05:43:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 14 05:43:09 2022 +0000
tree 4a85f8efa831b2a85474a9758ca0fb558b19f240
parent ecfeee7607781bcdd1139abf162a83c3d2d50c06
parent 506c1a0d177b3c646188a2cd8a5f9934f1acd8ff

Switch to source-built GSON. am: 55f629c89c am: d1136c4027 am: 9896636be3 am: 54f72d80db am: 506c1a0d17

Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/2215267

Change-Id: I5b250866169d2a1aec38ef1b70f47563ddc7ac95
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 36732ae..ee27cdd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,8 +17,8 @@
     main_class: "com.android.manifmerger.Merger",
     static_libs: [
         "manifest-merger-jars",
-        "guava-21.0",
-        "gson-prebuilt-jar",
+        "guava",
+        "gson",
         "kotlin-stdlib",
     ],
 }