From 0053bc644b27796952c58351fa359dd35a8370cb Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Mon, 14 Mar 2016 18:12:47 +0000
Subject: Description redacted. -- MOS_MIGRATED_REVID=117151379

---
 .../build/buildjar/ReducedClasspathJavaLibraryBuilder.java         | 7 +++++++
 1 file changed, 7 insertions(+)

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 81eaf60fdd..9f12705641 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
@@ -51,6 +51,13 @@ 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();
+    }
     String[] javacArguments = makeJavacArguments(build, compressedClasspath);
 
     // Compile!
-- 
cgit v1.2.3