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_r1

This reverts commit cfead78069f3dc32998dc118ee08cab3867acea2.
Bug: 6079915

1 files changed, 4 insertions, 10 deletions

diff --git a/src/proguard/GPL.java b/src/proguard/GPL.java
index 9327b8b..272a837 100644
--- a/src/proguard/GPL.java
+++ b/src/proguard/GPL.java
@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2011 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu)
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -48,10 +48,9 @@ public class GPL
         {
             String uniquePackageNames = uniquePackageNames(unknownPackageNames);
 
-            System.out.println("ProGuard is released under the GNU General Public License. You therefore");
-            System.out.println("must ensure that programs that link to it ("+uniquePackageNames+"...)");
-            System.out.println("carry the GNU General Public License as well. Alternatively, you can");
-            System.out.println("apply for an exception with the author of ProGuard.");
+            System.out.println("ProGuard is released under the GNU General Public License. The authors of all");
+            System.out.println("programs or plugins that link to it ("+uniquePackageNames+"...) therefore");
+            System.out.println("must ensure that these programs carry the GNU General Public License as well.");
         }
     }
 
@@ -166,14 +165,9 @@ public class GPL
                packageName.startsWith("org.apache.tools.maven") ||
                packageName.startsWith("org.eclipse")            ||
                packageName.startsWith("org.netbeans")           ||
-               packageName.startsWith("com.android")            ||
                packageName.startsWith("com.sun.kvem")           ||
                packageName.startsWith("net.certiv.proguarddt")  ||
-               packageName.startsWith("scala")                  ||
-               packageName.startsWith("sbt")                    ||
-               packageName.startsWith("xsbt")                   ||
                packageName.startsWith("eclipseme")              ||
-               packageName.startsWith("com.neomades")           ||
                packageName.startsWith("jg.j2me")                ||
                packageName.startsWith("jg.common")              ||
                packageName.startsWith("jg.buildengine");