aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
diff options
context:
space:
mode:
authorGravatar Laszlo Csomor <laszlocsomor@google.com>2017-07-10 12:17:22 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-07-10 14:32:40 +0200
commit9cce261badc3089ef676a8b4ea9816890d08ee45 (patch)
treeee358e7522d9b75dec7d26730e36344eb020d6d4 /src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
parent93dc21fea53263ecce68db2e88bb9186c42600f7 (diff)
Android: fix path bugs and enable tests on Windows
Now all tests under //src/test/j/c/g/devtools/build/android/...:* pass on Windows, yay! Also adjust test sizes as advised by Bazel (using --test_verbose_timeout_warnings). See https://github.com/bazelbuild/bazel/issues/3264 Change-Id: I3f1f4978306bdedaf805149295daa413d2248fbb PiperOrigin-RevId: 161373699
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
index 938627afa5..58e499589a 100644
--- a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
+++ b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
@@ -377,8 +377,9 @@ public class FullyQualifiedName implements DataKey {
+ "The path is expected to be <resource type>/<file name>.",
source));
}
- String pathWithExtension =
- source.subpath(source.getNameCount() - 2, source.getNameCount()).toString();
+ // Compose the `pathWithExtension` manually to ensure it uses a forward slash.
+ // Using Path.subpath would return a backslash-using path on Windows.
+ String pathWithExtension = source.getParent().getFileName() + "/" + source.getFileName();
int extensionStart = pathWithExtension.indexOf('.');
if (extensionStart > 0) {
return pathWithExtension.substring(0, extensionStart);