aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Ager <ager@google.com>2018-05-23 09:39:19 +0200
committerMads Ager <ager@google.com>2018-05-23 07:39:34 +0000
commit0326d86a6e0a6179ea6cd72353f6f051efccd894 (patch)
treefe29f424a3111fb01e122ede8a5e49e38a11a14d
parent10bec877ee7377a67999c1ef80c82440e20d0693 (diff)
downloadr8-0326d86a6e0a6179ea6cd72353f6f051efccd894.tar.gz
Cleanup r8-wip-dev r8 dependencies.android-o-mr1-iot-release-1.0.1
Apache commons compress is not used by D8 and R8. We are switching from json-simple to gson. In order to make sure that r8-wip-dev does not break when we do so, this adds gson as a dependency. Once we have landed the switch to gson, we need to delete the json-simple deps. Test: mmma -j external/r8 Change-Id: I5b2bf2484f148e01c48a29a7730cdb44c76d7ac8
-rw-r--r--Android.bp2
-rw-r--r--deps/commons-compress-1.12.jarbin442553 -> 0 bytes
-rw-r--r--deps/gson-2.7.jarbin0 -> 231952 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 808cd95f8..0f1374626 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,8 +34,8 @@ java_import_host {
"deps/asm-commons-6.0.jar",
"deps/asm-tree-6.0.jar",
"deps/asm-util-6.0.jar",
- "deps/commons-compress-1.12.jar",
"deps/fastutil-7.2.0.jar",
+ "deps/gson-2.7.jar",
"deps/jopt-simple-4.6.jar",
"deps/json-simple-1.1.1.jar",
"deps/guava-23.0.jar",
diff --git a/deps/commons-compress-1.12.jar b/deps/commons-compress-1.12.jar
deleted file mode 100644
index 4867705ea..000000000
--- a/deps/commons-compress-1.12.jar
+++ /dev/null
Binary files differ
diff --git a/deps/gson-2.7.jar b/deps/gson-2.7.jar
new file mode 100644
index 000000000..be5b59b76
--- /dev/null
+++ b/deps/gson-2.7.jar
Binary files differ