Add -systemjars support to Proguardandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev

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

1 files changed, 18 insertions, 0 deletions

diff --git a/src/proguard/Configuration.java b/src/proguard/Configuration.java
index 0b855a5..fc212f6 100644
--- a/src/proguard/Configuration.java
+++ b/src/proguard/Configuration.java
@@ -39,6 +39,24 @@ public class Configuration
     // Input and output options.
     ///////////////////////////////////////////////////////////////////////////
 
+    // Android-added: Add -systemjars option.
+    /**
+     * A list of system entries (jars, wars, ears, zips, and directories).
+     *
+     * <p>A system jar is one that appears on the runtime classpath before the program jars. Unless
+     * there are duplicate classes between it and a program jar then it behaves no different to a
+     * library jar. If there are duplicate classes between it and a program jar then the class in
+     * the system jar will be used and the duplicate class in the program jar will be ignored.
+     * Conversely, if a library jar contains duplicates of classes in a program jar then the class
+     * in the program jar will be used and the one in the library jar will be ignored.
+     *
+     * <p>e.g. the android.jar from the Android SDK should usually be treated as a system jar
+     * because at runtime if the APK contains duplicates of classes in android.jar then the ones in
+     * the APK will be ignored; unless the APK does some ClassLoader manipulation to change that
+     * behavior.
+     */
+    public ClassPath systemJars;
+
     /**
      * A list of input and output entries (jars, wars, ears, zips, and directories).
      */