Upgrade Proguard to 5.1.

Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/

Bug: 17550647

(cherry picked from commit 2270795fbe0b277bfd49f40950ecaa78583175cc)

Change-Id: I4d4c6b4f11aca8d5595b7f285c675bc5873d5e24

1 files changed, 17 insertions, 1 deletions

diff --git a/src/proguard/ant/ClassPathElement.java b/src/proguard/ant/ClassPathElement.java
index b496123..ef5b510 100644
--- a/src/proguard/ant/ClassPathElement.java
+++ b/src/proguard/ant/ClassPathElement.java
@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2014 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
@@ -36,7 +36,9 @@ import java.io.File;
 public class ClassPathElement extends Path
 {
     private String filter;
+    private String apkFilter;
     private String jarFilter;
+    private String aarFilter;
     private String warFilter;
     private String earFilter;
     private String zipFilter;
@@ -120,7 +122,9 @@ public class ClassPathElement extends Path
                 new ClassPathEntry(file.isAbsolute() ? file : new File(baseDir, fileName),
                                    output);
             entry.setFilter(ListUtil.commaSeparatedList(filter));
+            entry.setApkFilter(ListUtil.commaSeparatedList(apkFilter));
             entry.setJarFilter(ListUtil.commaSeparatedList(jarFilter));
+            entry.setAarFilter(ListUtil.commaSeparatedList(aarFilter));
             entry.setWarFilter(ListUtil.commaSeparatedList(warFilter));
             entry.setEarFilter(ListUtil.commaSeparatedList(earFilter));
             entry.setZipFilter(ListUtil.commaSeparatedList(zipFilter));
@@ -166,12 +170,24 @@ public class ClassPathElement extends Path
     }
 
 
+    public void setApkfilter(String apkFilter)
+    {
+        this.apkFilter = apkFilter;
+    }
+
+
     public void setJarfilter(String jarFilter)
     {
         this.jarFilter = jarFilter;
     }
 
 
+    public void setAarfilter(String aarFilter)
+    {
+        this.aarFilter = aarFilter;
+    }
+
+
     public void setWarfilter(String warFilter)
     {
         this.warFilter = warFilter;