commit 1ec9adcabffb5d1ea5ab4a24634e9c01e1a6b693
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Feb 15 19:01:02 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Feb 15 18:01:20 2019 +0000
tree 807cd4ea6b2beceee0efac0d18db525662ae5d44
parent 7a8cdec141ada516bcc1a40d4138612287d46ffb

Update AndroidAppConsumers to avoid "zip file closed" issue for CF

Bug: 124181030
Change-Id: I94d78b3325896f671e1f014cd79384d61aa0788b

src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java

diff --git a/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java b/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java
index a855ab7..4b986b8 100644
--- a/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java
+++ b/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java
@@ -194,23 +194,37 @@
 
           @Override
           public DataResourceConsumer getDataResourceConsumer() {
-            assert consumer.getDataResourceConsumer() == null;
+            DataResourceConsumer dataResourceConsumer = consumer.getDataResourceConsumer();
             return new DataResourceConsumer() {
 
               @Override
               public void accept(
                   DataDirectoryResource directory, DiagnosticsHandler diagnosticsHandler) {
-                // Ignore.
+                if (dataResourceConsumer != null) {
+                  dataResourceConsumer.accept(directory, diagnosticsHandler);
+                }
               }
 
               @Override
               public void accept(DataEntryResource file, DiagnosticsHandler diagnosticsHandler) {
-                builder.addDataResource(file);
+                try {
+                  byte[] bytes = ByteStreams.toByteArray(file.getByteStream());
+                  DataEntryResource copy =
+                      DataEntryResource.fromBytes(bytes, file.getName(), file.getOrigin());
+                  builder.addDataResource(copy);
+                  if (dataResourceConsumer != null) {
+                    dataResourceConsumer.accept(copy, diagnosticsHandler);
+                  }
+                } catch (IOException | ResourceException e) {
+                  throw new RuntimeException(e);
+                }
               }
 
               @Override
               public void finished(DiagnosticsHandler handler) {
-                // Ignore.
+                if (dataResourceConsumer != null) {
+                  dataResourceConsumer.finished(handler);
+                }
               }
             };
           }