diff options
author | Yun Peng <pcloudy@google.com> | 2017-03-02 18:41:37 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2017-03-03 10:37:29 +0000 |
commit | 371b0dcafd3ee8ca109064a0d9203719b2e483e2 (patch) | |
tree | 3b2e932d70ce2613c07c198588769980f802fca7 /src/tools/android/java/com/google | |
parent | 1b44df38b6e7979b58988e264a4c04b1b6146c85 (diff) |
Fix JarFilterTest on Windows
fixed https://github.com/bazelbuild/bazel/issues/1946
--
Change-Id: Id91c973fb63093024125148a83ecf5948e8f729e
Reviewed-on: https://cr.bazel.build/9170
PiperOrigin-RevId: 149020118
MOS_MIGRATED_REVID=149020118
Diffstat (limited to 'src/tools/android/java/com/google')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ideinfo/JarFilter.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/JarFilter.java b/src/tools/android/java/com/google/devtools/build/android/ideinfo/JarFilter.java index 92f55db9aa..c5ed8b4863 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/JarFilter.java +++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/JarFilter.java @@ -333,6 +333,10 @@ public final class JarFilter { */ private static String getArchiveFileNamePrefix(String javaFile, String packageString) { int lastSlashIndex = javaFile.lastIndexOf('/'); + // On Windows, the separator could be '\\' + if (lastSlashIndex == -1) { + lastSlashIndex = javaFile.lastIndexOf('\\'); + } String fileName = lastSlashIndex != -1 ? javaFile.substring(lastSlashIndex + 1) : javaFile; String className = fileName.substring(0, fileName.length() - ".java".length()); return packageString.replace('.', '/') + '/' + className; |