diff options
| author | Colin Cross <ccross@android.com> | 2019-04-16 16:35:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-16 16:35:42 -0700 |
| commit | f1aacb0c3a15dd738fc15b50dc9f181d523bb24a (patch) | |
| tree | 1933e8802ff8e3c93092a7ebc9f7cac25bab1daa | |
| parent | 1cab7757d38e9c05c1cc5c7bb8dbd87c0d9f86da (diff) | |
| parent | e0ad28a80abe80f270250a6d1143ed5737ea2d30 (diff) | |
| download | apkzlib-f1aacb0c3a15dd738fc15b50dc9f181d523bb24a.tar.gz | |
Update apkzlib for guava 27.1
am: e0ad28a80a
Change-Id: If59899de046a00f7938e94e5d4b2a24e4dee8dc8
| -rw-r--r-- | src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java b/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java index b7949b5..cca5f40 100644 --- a/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java +++ b/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -2472,7 +2473,7 @@ public class ZFile implements Closeable { return; } - for (File f : Files.fileTreeTraverser().preOrderTraversal(file).skip(1)) { + for (File f : Iterables.skip(Files.fileTraverser().depthFirstPreOrder(file), 1)) { String path = file.toURI().relativize(f.toURI()).getPath(); InputStream stream; |