diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-11-10 14:20:59 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2018-01-08 19:51:15 +0000 |
| commit | 45e52b5ab37a26149ce031caa44bb167da217667 (patch) | |
| tree | 61a3b7248024bbf31d1f180e9c2477696f042517 /src/proguard/ConfigurationParser.java | |
| parent | e8bc3b2a283ea35317a8096dcf2c3d9959af40b2 (diff) | |
Try and address the problem of using Proguard with applications that
duplicate some classes in android.jar, e.g. applications that
statically include junit.
See https://sourceforge.net/p/proguard/discussion/182455/thread/76430d9e/
for more information.
Rebuilt proguard with ant 1.10.1 and gradle 2.1
Bug: 30188076
Bug: 69156675
Test: make checkbuild
Change-Id: I574becf07ed4a247e966f2c023e4b95b5ffc4011
Diffstat (limited to 'src/proguard/ConfigurationParser.java')
| -rw-r--r-- | src/proguard/ConfigurationParser.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/proguard/ConfigurationParser.java b/src/proguard/ConfigurationParser.java index 72949cf..b07ef93 100644 --- a/src/proguard/ConfigurationParser.java +++ b/src/proguard/ConfigurationParser.java @@ -154,6 +154,8 @@ public class ConfigurationParser else if (ConfigurationConstants.INJARS_OPTION .startsWith(nextWord)) configuration.programJars = parseClassPathArgument(configuration.programJars, false); else if (ConfigurationConstants.OUTJARS_OPTION .startsWith(nextWord)) configuration.programJars = parseClassPathArgument(configuration.programJars, true); else if (ConfigurationConstants.LIBRARYJARS_OPTION .startsWith(nextWord)) configuration.libraryJars = parseClassPathArgument(configuration.libraryJars, false); + // Android-added: Parse -systemjars option. + else if (ConfigurationConstants.SYSTEMJARS_OPTION .startsWith(nextWord)) configuration.systemJars = parseClassPathArgument(configuration.systemJars, false); else if (ConfigurationConstants.RESOURCEJARS_OPTION .startsWith(nextWord)) throw new ParseException("The '-resourcejars' option is no longer supported. Please use the '-injars' option for all input"); else if (ConfigurationConstants.SKIP_NON_PUBLIC_LIBRARY_CLASSES_OPTION .startsWith(nextWord)) configuration.skipNonPublicLibraryClasses = parseNoArgument(true); else if (ConfigurationConstants.DONT_SKIP_NON_PUBLIC_LIBRARY_CLASSES_OPTION .startsWith(nextWord)) configuration.skipNonPublicLibraryClasses = parseNoArgument(false); |