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
MOS_MIGRATED_REVID=146143519
@@ -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();
