diff options
author | Liam Miller-Cushon <cushon@google.com> | 2017-03-24 03:43:50 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2017-03-24 12:19:30 +0000 |
commit | 2ebb4bef14d2a908c21e4908acea4b68abbe8ed0 (patch) | |
tree | 00aca28e10315f9da5cd475a775cc853b4242e54 /src/java_tools/buildjar | |
parent | 5e1a420f1b385382a2df5359faf3ae773aa8d61e (diff) |
Remove obsolete extdir handling
--
PiperOrigin-RevId: 151089412
MOS_MIGRATED_REVID=151089412
Diffstat (limited to 'src/java_tools/buildjar')
-rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java | 27 |
1 files changed, 2 insertions, 25 deletions
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 2c1148c3a8..f85468a29e 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.BlazeJavaCompilerPlugin; 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 @@ public final class JavaLibraryBuildRequest { .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 @@ public final class JavaLibraryBuildRequest { .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(); |