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

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();