| commit | c1b203c23f515785965a569feed31eda40e2815e | [log] [tgz] |
|---|---|---|
| author | Morten Krogh-Jespersen <mkroghj@google.com> | Wed Aug 05 11:40:31 2020 +0200 |
| committer | Morten Krogh-Jespersen <mkroghj@google.com> | Wed Aug 05 11:40:31 2020 +0200 |
| tree | 6f3f5d160bda6bd0642b423199290163af6909d0 | |
| parent | df7f5bef7613e8afde06166354c9c3817640524c [diff] |
Version 2.0.98 Cherry-pick: Close stream of input source when dumping CL: https://r8-review.googlesource.com/52560 Bug: 160901582 Change-Id: If4a3bbe119eefeb50b7c71124edd8e1289ed830f
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 46f7e8d..126673b 100644 --- a/src/main/java/com/android/tools/r8/Version.java +++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@ // This field is accessed from release scripts using simple pattern matching. // Therefore, changing this field could break our release scripts. - public static final String LABEL = "2.0.97"; + public static final String LABEL = "2.0.98"; private Version() { }
diff --git a/src/main/java/com/android/tools/r8/utils/AndroidApp.java b/src/main/java/com/android/tools/r8/utils/AndroidApp.java index c4a37c2..6f47839 100644 --- a/src/main/java/com/android/tools/r8/utils/AndroidApp.java +++ b/src/main/java/com/android/tools/r8/utils/AndroidApp.java
@@ -519,7 +519,7 @@ ZipOutputStream archiveOutputStream, ProgramResource programResource) throws ResourceException, IOException { - byte[] bytes = ByteStreams.toByteArray(programResource.getByteStream()); + byte[] bytes = StreamUtils.StreamToByteArrayClose(programResource.getByteStream()); String entryName; if (programResource.getKind() == Kind.CF) { Set<String> classDescriptors = programResource.getClassDescriptors();