From 2879971666e0cc3f1f24ae91b88c4400af77e7f3 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Fri, 24 Mar 2017 04:36:39 +0000
Subject: Remove support for -bootclasspath in javacopts

--
PiperOrigin-RevId: 151092346
MOS_MIGRATED_REVID=151092346
---
 .../com/google/devtools/build/buildjar/OptionsParser.java | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/java_tools')

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 f4cc69544d..feebbe2691 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,7 +27,6 @@ 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;
@@ -109,7 +108,6 @@ public final class OptionsParser {
           // otherwise we have to do something like adding a "--"
           // terminator to the passed arguments.
           collectFlagArguments(javacOpts, argQueue, "--");
-          bootClassPathFromJavacOpts();
           break;
         case "--direct_dependency":
           {
@@ -324,19 +322,6 @@ public final class OptionsParser {
     postProcessors.put(processorName, arguments);
   }
 
-  // TODO(cushon): update Blaze to set --bootclasspath directly
-  private void bootClassPathFromJavacOpts() {
-    Iterator<String> it = javacOpts.iterator();
-    while (it.hasNext()) {
-      String curr = it.next();
-      if (curr.equals("-bootclasspath") && it.hasNext()) {
-        it.remove();
-        bootClassPath = it.next();
-        it.remove();
-      }
-    }
-  }
-
   public List<String> getJavacOpts() {
     return javacOpts;
   }
-- 
cgit v1.2.3