aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Dmitry Lomov <dslomov@google.com>2016-01-29 11:53:37 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-01-29 14:42:29 +0000
commit1ef62e79a4ad920cb1339abc8cf286223f8f3f54 (patch)
tree30b8915d5bb58c137ce83d9d3319ea05288a72fb /src
parentfebd894adee459d8edb42bbe9e483708e580133a (diff)
Use correct file path separator.
-- MOS_MIGRATED_REVID=113349046
Diffstat (limited to 'src')
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/CommonJavaLibraryProcessor.java3
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/CommonJavaLibraryProcessor.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/CommonJavaLibraryProcessor.java
index a3e35386ea..ee5c727401 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/CommonJavaLibraryProcessor.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/CommonJavaLibraryProcessor.java
@@ -14,6 +14,7 @@
package com.google.devtools.build.buildjar;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +45,7 @@ public abstract class CommonJavaLibraryProcessor {
// Add an empty source path to prevent javac from sucking in source files
// from .jar files on the classpath.
args.add("-sourcepath");
- args.add(":");
+ args.add(File.pathSeparator);
if (build.getExtdir() != null) {
args.add("-extdirs");
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
index aed158effb..b3350d9a3e 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/DependencyModule.java
@@ -25,6 +25,7 @@ import com.google.devtools.build.lib.view.proto.Deps.Dependency.Kind;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
@@ -267,7 +268,7 @@ public final class DependencyModule {
}
private static final Splitter CLASSPATH_SPLITTER = Splitter.on(':');
- private static final Joiner CLASSPATH_JOINER = Joiner.on(':');
+ private static final Joiner CLASSPATH_JOINER = Joiner.on(File.pathSeparator);
/**
* Computes a reduced compile-time classpath from the union of direct dependencies and their