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/ConfigurationWriter.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/ConfigurationWriter.java')
| -rw-r--r-- | src/proguard/ConfigurationWriter.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/proguard/ConfigurationWriter.java b/src/proguard/ConfigurationWriter.java index d87f47e..c421345 100644 --- a/src/proguard/ConfigurationWriter.java +++ b/src/proguard/ConfigurationWriter.java @@ -104,6 +104,13 @@ public class ConfigurationWriter configuration.libraryJars); writer.println(); + // Android-added: Write value of -systemjars option to configuration file. + // Write the system class path (output entries only). + writeJarOptions(ConfigurationConstants.SYSTEMJARS_OPTION, + ConfigurationConstants.SYSTEMJARS_OPTION, + configuration.systemJars); + writer.println(); + // Write the other options. writeOption(ConfigurationConstants.SKIP_NON_PUBLIC_LIBRARY_CLASSES_OPTION, configuration.skipNonPublicLibraryClasses); writeOption(ConfigurationConstants.DONT_SKIP_NON_PUBLIC_LIBRARY_CLASS_MEMBERS_OPTION, !configuration.skipNonPublicLibraryClassMembers); |