summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof KosiƄski <krzysio@google.com>2022-09-14 04:17:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-14 04:17:00 +0000
commit9896636be319785d067de2e6880866b938bbe597 (patch)
tree4a85f8efa831b2a85474a9758ca0fb558b19f240
parentecfeee7607781bcdd1139abf162a83c3d2d50c06 (diff)
parentd1136c40276a6f34aba37ec7418ce8b5ac226ebe (diff)
downloadmanifest-merger-9896636be319785d067de2e6880866b938bbe597.tar.gz
Switch to source-built GSON. am: 55f629c89c am: d1136c4027
Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/2215267 Change-Id: Ia66242ef160e4a2b727794c42b26b8e4197d1604 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 36732ae..ee27cdd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,8 +17,8 @@ java_binary_host {
main_class: "com.android.manifmerger.Merger",
static_libs: [
"manifest-merger-jars",
- "guava-21.0",
- "gson-prebuilt-jar",
+ "guava",
+ "gson",
"kotlin-stdlib",
],
}