Re-enabling passing -sourcepath via javacopts.

This is needed until java_common.compile will be strong enough to replace
java_library, exposing all its features.

PiperOrigin-RevId: 155773169

1 files changed, 14 insertions, 0 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
index e72d4c3a59..1d6da623d7 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
@@ -27,6 +27,7 @@ import java.util.Collection;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -110,6 +111,7 @@ public final class OptionsParser {
           // otherwise we have to do something like adding a "--"
           // terminator to the passed arguments.
           collectFlagArguments(javacOpts, argQueue, "--");
+          sourcePathFromJavacOpts();
           break;
         case "--direct_dependency":
           {
@@ -220,6 +222,18 @@ public final class OptionsParser {
     }
   }
 
+  private void sourcePathFromJavacOpts() {
+    Iterator<String> it = javacOpts.iterator();
+    while (it.hasNext()) {
+      String curr = it.next();
+      if (curr.equals("-sourcepath") && it.hasNext()) {
+        it.remove();
+        sourcePath = it.next();
+        it.remove();
+      }
+    }
+  }
+
   private JarOwner parseJarOwner(String line) {
     List<String> ownerStringParts = SPACE_SPLITTER.splitToList(line);
     JarOwner owner;