Upgrade bundled Proguard to version 4.7
This changeset switches the build script from picking up the platform
version of Proguard (in external/) to the new Proguard 4.7 library in
the prebuilts/tools repository.
(We now also include examples/ and docs/, but exclude src/ and build/
from the 4.7 distribution.)
Change-Id: I6fd32cb568252bc80e85ddb7ae821bc02c22711a
diff --git a/build/tools.atree b/build/tools.atree
index 8ff0554..d03365f 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -132,17 +132,17 @@
prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar tools/lib/lombok_ast-0.2.jar
# Proguard
-external/proguard/docs/license.html tools/proguard/license.html
-external/proguard/docs/GPL.html tools/proguard/GPL.html
-external/proguard/docs/GPL_exception.html tools/proguard/GPL_exception.html
-external/proguard/lib/proguard.jar tools/proguard/lib/proguard.jar
-external/proguard/lib/proguardgui.jar tools/proguard/lib/proguardgui.jar
-external/proguard/lib/retrace.jar tools/proguard/lib/retrace.jar
-external/proguard/bin/proguard.sh tools/proguard/bin/proguard.sh
-external/proguard/bin/proguardgui.sh tools/proguard/bin/proguardgui.sh
-external/proguard/bin/retrace.sh tools/proguard/bin/retrace.sh
-external/proguard/src/proguard/ant/task.properties tools/proguard/ant/task.properties
-
+# We're skipping the build and src/ trees (except for src/proguard/ant/task.properties)
+# and copying in a license.html file
+prebuilts/tools/common/proguard/license.html tools/proguard/license.html
+prebuilts/tools/common/proguard/proguard4.7/README tools/proguard/README
+prebuilts/tools/common/proguard/proguard4.7/docs tools/proguard/docs
+prebuilts/tools/common/proguard/proguard4.7/examples tools/proguard/examples
+prebuilts/tools/common/proguard/proguard4.7/lib tools/proguard/lib
+prebuilts/tools/common/proguard/proguard4.7/bin/proguard.sh tools/proguard/bin/proguard.sh
+prebuilts/tools/common/proguard/proguard4.7/bin/proguardgui.sh tools/proguard/bin/proguardgui.sh
+prebuilts/tools/common/proguard/proguard4.7/bin/retrace.sh tools/proguard/bin/retrace.sh
+prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties tools/proguard/ant/task.properties
# SDK Controller
sdk/apps/SdkController tools/apps/SdkController
diff --git a/build/tools.windows.atree b/build/tools.windows.atree
index 0374a30..3ca1a75 100755
--- a/build/tools.windows.atree
+++ b/build/tools.windows.atree
@@ -72,9 +72,9 @@
sdk/monkeyrunner/etc/monkeyrunner.bat tools/monkeyrunner.bat
rm tools/proguard/bin
-sdk/files/proguard/bin/proguard.bat tools/proguard/bin/proguard.bat
-sdk/files/proguard/bin/proguardgui.bat tools/proguard/bin/proguardgui.bat
-sdk/files/proguard/bin/retrace.bat tools/proguard/bin/retrace.bat
+prebuilts/tools/common/proguard/proguard4.7/bin/proguard.bat tools/proguard/bin/proguard.bat
+prebuilts/tools/common/proguard/proguard4.7/bin/retrace.bat tools/proguard/bin/retrace.bat
+prebuilts/tools/common/proguard/proguard4.7/bin/proguardgui.bat tools/proguard/bin/proguardgui.bat
rm tools/sqlite3
bin/sqlite3.exe strip tools/sqlite3.exe