aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Liam Miller-Cushon <cushon@google.com>2017-01-31 06:05:58 +0000
committerGravatar Yun Peng <pcloudy@google.com>2017-01-31 09:00:36 +0000
commitde59c450f6c5af3204596e6b1d869476276fb59f (patch)
tree2060d26d3a12ba339d1626d310ff3e79fd74eb55
parentb18f95e60330ad4f9510af822949d150c7912a2c (diff)
Don't add the output directory to the classpath
This was a work-around for a javac bug, and is unnecessary now that we're setting locations using the API. -- PiperOrigin-RevId: 146079935 MOS_MIGRATED_REVID=146079935
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/ReducedClasspathJavaLibraryBuilder.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/ReducedClasspathJavaLibraryBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/ReducedClasspathJavaLibraryBuilder.java
index 87d57dee31..648fd2c4ca 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/ReducedClasspathJavaLibraryBuilder.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/ReducedClasspathJavaLibraryBuilder.java
@@ -46,13 +46,6 @@ public class ReducedClasspathJavaLibraryBuilder extends SimpleJavaLibraryBuilder
compressedClasspath =
build.getDependencyModule().computeStrictClasspath(build.getClassPath());
}
- if (compressedClasspath.isEmpty()) {
- // If the empty classpath is specified and javac is invoked programatically,
- // javac falls back to using the host classpath. We don't want JavaBuilder
- // to leak onto the compilation classpath, so we add the (hopefully empty)
- // class output directory to prevent that from happening.
- compressedClasspath = build.getClassDir();
- }
// Compile!
BlazeJavacResult result =