commit 2ebb4bef14d2a908c21e4908acea4b68abbe8ed0
author Liam Miller-Cushon <cushon@google.com> Fri Mar 24 03:43:50 2017 +0000
committer Yue Gan <yueg@google.com> Fri Mar 24 12:19:30 2017 +0000
tree 00aca28e10315f9da5cd475a775cc853b4242e54
parent 5e1a420f1b385382a2df5359faf3ae773aa8d61e

Remove obsolete extdir handling

--
PiperOrigin-RevId: 151089412
MOS_MIGRATED_REVID=151089412

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
index 2c1148c..f85468a 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
@@ -25,9 +25,7 @@
 import com.google.devtools.build.buildjar.javac.plugins.dependency.DependencyModule;
 import com.google.devtools.build.buildjar.javac.plugins.processing.AnnotationProcessingModule;
 import java.io.File;
-import java.io.IOError;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -295,7 +293,8 @@
         .classPath(toPaths(classPath))
         .classOutput(Paths.get(getClassDir()))
         .bootClassPath(
-            ImmutableList.copyOf(Iterables.concat(toPaths(getBootClassPath()), getExtJars())))
+            ImmutableList.copyOf(
+                Iterables.concat(toPaths(getBootClassPath()), toPaths(getExtdir()))))
         .javacOptions(makeJavacArguments())
         .sourceFiles(ImmutableList.copyOf(getSourceFiles()))
         .processors(null)
@@ -306,28 +305,6 @@
         .build();
   }
 
-  // TODO(cushon): make Bazel pass the individual files instead of inferring a directory and
-  // listing it here
-  List<Path> getExtJars() {
-    if (getExtdir() == null) {
-      return ImmutableList.of();
-    }
-    ImmutableList.Builder<Path> jars = ImmutableList.builder();
-    for (String file : Splitter.on(File.pathSeparatorChar).split(getExtdir())) {
-      try {
-        Path path = Paths.get(file);
-        if (Files.isDirectory(path)) {
-          Files.list(path).forEach(jars::add);
-        } else {
-          jars.add(path);
-        }
-      } catch (IOException e) {
-        throw new IOError(e);
-      }
-    }
-    return jars.build();
-  }
-
   static ImmutableList<Path> toPaths(List<String> files) {
     if (files == null) {
       return ImmutableList.of();