Internal change

PiperOrigin-RevId: 173451767

1 files changed, 7 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java b/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java
index 08e77bf4f2..5dd51d4edf 100644
--- a/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java
+++ b/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.android.dexer;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableSet;
 import java.util.zip.ZipEntry;
 
@@ -44,10 +45,13 @@ class ZipEntryPredicates {
   }
 
   public static Predicate<ZipEntry> classFileFilter(final ImmutableSet<String> classFileNames) {
-    return new Predicate<ZipEntry>() {
+    return Predicates.compose(classFileNameFilter(classFileNames), zipEntry -> zipEntry.getName());
+  }
+
+  public static Predicate<String> classFileNameFilter(final ImmutableSet<String> classFileNames) {
+    return new Predicate<String>() {
       @Override
-      public boolean apply(ZipEntry input) {
-        String filename = input.getName();
+      public boolean apply(String filename) {
         if (filename.endsWith(".class.dex")) {
           // Chop off file suffix generated by DexBuilder
           filename = filename.substring(0, filename.length() - ".dex".length());