Revert "Upgrade from Progaurd 4.4 to 4.7."android-sdk-support_r11android-cts-4.2_r2android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1tools_r22tools_r21jb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-dev-plus-aospjb-mr1-devjb-dev

This reverts commit cfead78069f3dc32998dc118ee08cab3867acea2.
Bug: 6079915

6 files changed, 10 insertions, 34 deletions

diff --git a/bin/proguard.bat b/bin/proguard.bat
index 73cb313..9e91ebf 100644
--- a/bin/proguard.bat
+++ b/bin/proguard.bat
@@ -2,10 +2,6 @@
 
 REM Start-up script for ProGuard -- free class file shrinker, optimizer,
 REM obfuscator, and preverifier for Java bytecode.
-REM
-REM Note: when passing file names containing spaces to this script,
-REM       you'll have to add escaped quotes around them, e.g.
-REM       "\"C:/My Directory/My File.txt\""
 
 IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=..
diff --git a/bin/proguard.sh b/bin/proguard.sh
index 5adc047..5d441f9 100755
--- a/bin/proguard.sh
+++ b/bin/proguard.sh
@@ -2,11 +2,8 @@
 #
 # Start-up script for ProGuard -- free class file shrinker, optimizer,
 # obfuscator, and preverifier for Java bytecode.
-#
-# Note: when passing file names containing spaces to this script,
-#       you'll have to add escaped quotes around them, e.g.
-#       "\"/My Directory/My File.txt\""
 
-PROGUARD_HOME=`dirname "$0"`/..
+PROGUARD_HOME=`dirname "$0"`
+PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
 
-java -jar $PROGUARD_HOME/lib/proguard.jar "$@"
+java -jar "$PROGUARD_HOME"/lib/proguard.jar "$@"
diff --git a/bin/proguardgui.bat b/bin/proguardgui.bat
index 4aa9aeb..073d98a 100644
--- a/bin/proguardgui.bat
+++ b/bin/proguardgui.bat
@@ -2,13 +2,9 @@
 
 REM Start-up script for the GUI of ProGuard -- free class file shrinker,
 REM optimizer, obfuscator, and preverifier for Java bytecode.
-REM
-REM Note: when passing file names containing spaces to this script,
-REM       you'll have to add escaped quotes around them, e.g.
-REM       "\"C:/My Directory/My File.txt\""
 
 IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=..
 :home
 
-java -jar "%PROGUARD_HOME%"\lib\proguardgui.jar %*
+java -jar "%PROGUARD_HOME%"\lib\proguardgui.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/bin/proguardgui.sh b/bin/proguardgui.sh
index c734906..5a25d7b 100755
--- a/bin/proguardgui.sh
+++ b/bin/proguardgui.sh
@@ -2,14 +2,8 @@
 #
 # Start-up script for the GUI of ProGuard -- free class file shrinker,
 # optimizer, obfuscator, and preverifier for Java bytecode.
-#
-# Note: when passing file names containing spaces to this script,
-#       you'll have to add escaped quotes around them, e.g.
-#       "\"/My Directory/My File.txt\""
 
-PROGUARD_HOME=`dirname "$0"`/..
+PROGUARD_HOME=`dirname "$0"`
+PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
 
-# On Linux, Java 1.6.0_24 and higher hang when starting the GUI:
-#   http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7027598
-# We're using the -D option as a workaround.
-java -DsuppressSwingDropSupport=true -jar $PROGUARD_HOME/lib/proguardgui.jar "$@"
+java -jar $PROGUARD_HOME/lib/proguardgui.jar "$@"
diff --git a/bin/retrace.bat b/bin/retrace.bat
index c13b766..70603d3 100644
--- a/bin/retrace.bat
+++ b/bin/retrace.bat
@@ -2,13 +2,9 @@
 
 REM Start-up script for Retrace -- companion tool for ProGuard, free class file
 REM shrinker, optimizer, obfuscator, and preverifier for Java bytecode.
-REM
-REM Note: when passing file names containing spaces to this script,
-REM       you'll have to add escaped quotes around them, e.g.
-REM       "\"C:/My Directory/My File.txt\""
 
 IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=..
 :home
 
-java -jar "%PROGUARD_HOME%"\lib\retrace.jar %*
+java -jar "%PROGUARD_HOME%"\lib\retrace.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/bin/retrace.sh b/bin/retrace.sh
index 85fd314..5db744e 100755
--- a/bin/retrace.sh
+++ b/bin/retrace.sh
@@ -2,11 +2,8 @@
 #
 # Start-up script for Retrace -- companion tool for ProGuard, free class file
 # shrinker, optimizer, obfuscator, and preverifier for Java bytecode.
-#
-# Note: when passing file names containing spaces to this script,
-#       you'll have to add escaped quotes around them, e.g.
-#       "\"/My Directory/My File.txt\""
 
-PROGUARD_HOME=`dirname "$0"`/..
+PROGUARD_HOME=`dirname "$0"`
+PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
 
 java -jar $PROGUARD_HOME/lib/retrace.jar "$@"