diff options
| author | Xin Li <delphij@google.com> | 2018-08-07 16:51:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 16:51:26 +0000 |
| commit | 36970ce525dc985249bab46ac305eb6401abb26a (patch) | |
| tree | 61a3b7248024bbf31d1f180e9c2477696f042517 /src/proguard/ConfigurationParser.java | |
| parent | af893cdc1242e4cfbeeb10e2323f9a689a825177 (diff) | |
| parent | fc2d791d27cbb2203eccdda5e407ec28e95cf12e (diff) | |
| download | proguard-36970ce525dc985249bab46ac305eb6401abb26a.tar.gz | |
Merge "Merge Android Pie into master"master-cuttlefish-testing-release
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); |