diff options
author | Liam Miller-Cushon <cushon@google.com> | 2017-01-31 19:29:10 +0000 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-02-01 08:55:18 +0000 |
commit | 75324c3893c920a3316ab9b70f5cf8d6454f6887 (patch) | |
tree | 3be1aa990750bf4ac38be467816d9a325f28ae98 /src/main/java | |
parent | bdbb0be1aebb6ba0c597fc53f2d87c924279645d (diff) |
Pass individual extdir inputs, instead of inferring a directory
Corresponding JavaBuilder change:
https://github.com/bazelbuild/bazel/blo[]fa9b24cb7b1e516f92a200d9087fd3ba561e5/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java#L302
--
PiperOrigin-RevId: 146143519
MOS_MIGRATED_REVID=146143519
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java index 672646e7ee..46ab4946da 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java @@ -669,12 +669,7 @@ public final class JavaCompileAction extends AbstractAction { result.addExecPath("--output_deps_proto", outputDepsProto); } if (!extdirInputs.isEmpty()) { - result.add("--extdir"); - LinkedHashSet<PathFragment> extdirs = new LinkedHashSet<>(); - for (Artifact extjar : extdirInputs) { - extdirs.add(extjar.getExecPath().getParentDirectory()); - } - result.add(Joiner.on(pathSeparator).join(extdirs)); + result.addJoinExecPaths("--extdir", pathSeparator, extdirInputs); } if (!processorPath.isEmpty() || !processorPathDirs.isEmpty()) { ImmutableList.Builder<String> execPathStrings = ImmutableList.<String>builder(); |