diff options
| author | Ying Wang <wangying@google.com> | 2012-02-27 18:34:24 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-02-27 18:34:24 -0800 |
| commit | 9f606f95f03a75961498803e24bee6799a7c0885 (patch) | |
| tree | a45f4d74feda9b76277a0c9ced55ad15d82248a1 /src/proguard/Initializer.java | |
| parent | cfead78069f3dc32998dc118ee08cab3867acea2 (diff) | |
| download | proguard-9f606f95f03a75961498803e24bee6799a7c0885.tar.gz | |
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
Diffstat (limited to 'src/proguard/Initializer.java')
| -rw-r--r-- | src/proguard/Initializer.java | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/proguard/Initializer.java b/src/proguard/Initializer.java index dc17b00..41cf971 100644 --- a/src/proguard/Initializer.java +++ b/src/proguard/Initializer.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 @@ -60,11 +60,6 @@ public class Initializer { int originalLibraryClassPoolSize = libraryClassPool.size(); - // Perform a basic check on the keep options in the configuration. - WarningPrinter keepClassMemberNotePrinter = new WarningPrinter(System.out, configuration.note); - - new KeepClassMemberChecker(keepClassMemberNotePrinter).checkClassSpecifications(configuration.keep); - // Construct a reduced library class pool with only those library // classes whose hierarchies are referenced by the program classes. // We can't do this if we later have to come up with the obfuscated @@ -280,12 +275,8 @@ public class Initializer { System.err.println("Warning: there were " + classReferenceWarningCount + " unresolved references to classes or interfaces."); - System.err.println(" You may need to specify additional library jars (using '-libraryjars')."); - - if (configuration.skipNonPublicLibraryClasses) - { - System.err.println(" You may also have to remove the option '-skipnonpubliclibraryclasses'."); - } + System.err.println(" You may need to specify additional library jars (using '-libraryjars'),"); + System.err.println(" or perhaps the '-dontskipnonpubliclibraryclasses' option."); } int dependencyWarningCount = dependencyWarningPrinter.getWarningCount(); @@ -304,13 +295,9 @@ public class Initializer " unresolved references to program class members."); System.err.println(" Your input classes appear to be inconsistent."); System.err.println(" You may need to recompile them and try again."); - System.err.println(" Alternatively, you may have to specify the option "); + System.err.println(" Alternatively, you may have to specify the options "); + System.err.println(" '-dontskipnonpubliclibraryclasses' and/or"); System.err.println(" '-dontskipnonpubliclibraryclassmembers'."); - - if (configuration.skipNonPublicLibraryClasses) - { - System.err.println(" You may also have to remove the option '-skipnonpubliclibraryclasses'."); - } } if ((classReferenceWarningCount > 0 || |