aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
diff options
context:
space:
mode:
authorGravatar dannark <dannark@google.com>2017-10-18 12:58:15 -0400
committerGravatar John Cater <jcater@google.com>2017-10-18 13:34:50 -0400
commitb34bd075d6dcb1f0b6bab27778fa40471a25247f (patch)
tree41324fbaabc955d870736e354fb80eb3f6b12465 /src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
parent02605ddd85daa451a5d43b4b1b0da18ed7433f39 (diff)
Add directory entries to the resource_files.zip because robolectric relies on this to properly index the merged resources and assets.
RELNOTES:None PiperOrigin-RevId: 172615228
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
index 93a940a562..d23b7b6c63 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
@@ -193,6 +193,11 @@ public class AndroidResourceValidatorAction {
ZipEntry z = zis.getNextEntry();
while (z != null) {
String entryName = z.getName();
+ // Skip directory entries
+ if (entryName.endsWith("/")) {
+ z = zis.getNextEntry();
+ continue;
+ }
Path outputPath = expandedOut.resolve(entryName);
Files.createDirectories(outputPath.getParent());
try (OutputStream out = new BufferedOutputStream(Files.newOutputStream(outputPath))) {