Don't use java 9 InputStream::readAllBytes
Change-Id: I970910598f4ba5e3d9d2c9db40050fda7c285735
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java
index b8985a4..37b03d6 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java
@@ -20,6 +20,7 @@
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.google.common.collect.ImmutableList;
+import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collection;
@@ -141,7 +142,7 @@
for (String nonJavaFile : nonJavaFiles) {
ZipEntry entry = zipFile.getEntry(nonJavaFile);
assertNotNull(entry);
- String content = new String(zipFile.getInputStream(entry).readAllBytes());
+ String content = new String(ByteStreams.toByteArray(zipFile.getInputStream(entry)));
assertEquals(content, nonJavaFile);
}
}
@@ -177,7 +178,7 @@
for (String nonJavaFile : nonJavaFiles) {
ZipEntry entry = zipFile.getEntry(nonJavaFile);
assertNotNull(entry);
- String content = new String(zipFile.getInputStream(entry).readAllBytes());
+ String content = new String(ByteStreams.toByteArray(zipFile.getInputStream(entry)));
assertNotEquals(content, nonJavaFile);
}
}
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java b/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java
index b8420d7..fea2bce 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java
@@ -21,6 +21,7 @@
import com.android.tools.r8.utils.DescriptorUtils;
import com.android.tools.r8.utils.ZipUtils;
import com.google.common.collect.ImmutableList;
+import com.google.common.io.ByteStreams;
import dalvik.system.PathClassLoader;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -76,7 +77,7 @@
ZipEntry next = inputStream.getNextEntry();
while (next != null) {
outputStream.putNextEntry(new ZipEntry(next.getName()));
- outputStream.write(inputStream.readAllBytes());
+ outputStream.write(ByteStreams.toByteArray(inputStream));
outputStream.closeEntry();
next = inputStream.getNextEntry();
}
