commit 9bee83747af658a542adaa9cbeae7dbb205ad940
author Søren Gjesse <sgjesse@google.com> Mon Jun 19 08:34:57 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 19 08:34:57 2017 +0000
tree 48739581e94c47a7f19c28d9594ffa6ccef6b804
parent 9e261ba800ddc6f170b2f8b61d369aa49c4d9eda
parent e74fee3f365ac52a0210c1df5515a806e021d17a

Merge "Refactor the virtual file distribution"

.gitignore

diff --git a/.gitignore b/.gitignore
index bc26830..1529cd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,8 +34,8 @@
 third_party/jdwp-tests
 third_party/photos/*
 !third_party/photos/*.sha1
-third_party/proguard/proguard5.2.1.tar.gz
-third_party/proguard/proguard5.2.1
+third_party/proguard/
+!third_party/proguard/*.sha1
 third_party/proguardsettings.tar.gz
 third_party/proguardsettings/
 third_party/youtube/*

build.gradle

diff --git a/build.gradle b/build.gradle
index 3d007be..f3f3dff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -113,6 +113,7 @@
                 "android_jar/lib-v25.tar.gz",
                 "android_jar/lib-v26.tar.gz",
                 "proguard/proguard5.2.1.tar.gz",
+                "proguard/proguard5.3.3.tar.gz",
                 "gradle/gradle.tar.gz",
                 "jdwp-tests.tar.gz",
                 "jasmin.tar.gz",

third_party/proguard/proguard5.3.3.tar.gz.sha1

diff --git a/third_party/proguard/proguard5.3.3.tar.gz.sha1 b/third_party/proguard/proguard5.3.3.tar.gz.sha1
new file mode 100644
index 0000000..7a37d5c
--- /dev/null
+++ b/third_party/proguard/proguard5.3.3.tar.gz.sha1
@@ -0,0 +1 @@
+b197e2783baf8ade021d5feeaf609551735cd7b0
\ No newline at end of file