aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof KosiƄski <krzysio@google.com>2023-10-03 06:10:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-03 06:10:23 +0000
commit5f3d39619ec565f862f3d5aa072fb07448c6a0a8 (patch)
treefc404ed8c935947487ed31a864d9b668f5c9c051
parent5e8223649339798d6df7260b34f973b924dd1418 (diff)
parenta7762b08e3a3229e2e8b2b64ed21b8f32c2befb7 (diff)
downloadcaliper-5f3d39619ec565f862f3d5aa072fb07448c6a0a8.tar.gz
Use Gson built from source. am: 7ddb89d3d8 am: a7762b08e3
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/2770178 Change-Id: I8f63e0da41ee46f91d5ee1e3ebc9686afe6704de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp7
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index b48ee41..ca870cd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,6 +65,7 @@ java_library_host {
"apache-commons-math",
"caliper-prebuilts",
"dagger2",
+ "gson",
"guava",
"jsr330",
],
@@ -152,14 +153,8 @@ java_library_host {
// ============================================================
java_import_host {
- name: "caliper-gson",
- jars: ["lib/gson-2.2.2.jar"],
-}
-
-java_import_host {
name: "caliper-prebuilts",
jars: [
- "lib/gson-2.2.2.jar",
"lib/java-allocation-instrumenter-2.0.jar",
"lib/jersey-client-1.11.jar",
"lib/jersey-core-1.11.jar",