diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2017-07-11 10:37:58 +0200 |
|---|---|---|
| committer | László Csomor <laszlocsomor@google.com> | 2017-07-11 10:57:13 +0200 |
| commit | dc30e81c42c883e38d525e1d44a3a663306859db (patch) | |
| tree | 2224bcbfdbf1f0bd0a8974ddf6fc4f5dcb913c0e /src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java | |
| parent | e9e02123ba84bf05eca9c047278895b9158ea4cd (diff) | |
AndroidResourceOutputs: fix ZipEntry paths
Make sure that ZipEntry paths always use forward
slashes, even on Windows. Also add a test.
See https://github.com/bazelbuild/bazel/issues/3264
Change-Id: I4508e46dde49cd44c8e3792017d0d280a51dc565
PiperOrigin-RevId: 161500049
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java index 472e71f57e..608309f556 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java @@ -160,7 +160,7 @@ public class AndroidResourceOutputs { protected void addEntry(Path file, byte[] content) throws IOException { String prefix = directoryPrefix != null ? (directoryPrefix + "/") : ""; String relativeName = root.relativize(file).toString(); - ZipEntry entry = new ZipEntry(prefix + relativeName); + ZipEntry entry = new ZipEntry((prefix + relativeName).replace('\\', '/')); entry.setMethod(storageMethod); entry.setTime(normalizeTime(relativeName)); entry.setSize(content.length); |