Add a java_toolchain.tools attribute

for configuring additional Java compilation tools, which are
added as inputs to javac and turbine actions and available
for jvm_opts location expansion.

PiperOrigin-RevId: 162036912

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java
index 3d621a3715..cbb0159c07 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java
@@ -46,6 +46,7 @@ public abstract class JavaToolchainProvider implements TransitiveInfoProvider {
       NestedSet<Artifact> extclasspath,
       List<String> defaultJavacFlags,
       Artifact javac,
+      NestedSet<Artifact> tools,
       Artifact javaBuilder,
       @Nullable Artifact headerCompiler,
       boolean forciblyDisableHeaderCompilation,
@@ -65,6 +66,7 @@ public abstract class JavaToolchainProvider implements TransitiveInfoProvider {
         extclasspath,
         data.getEncoding(),
         javac,
+        tools,
         javaBuilder,
         headerCompiler,
         forciblyDisableHeaderCompilation,
@@ -107,6 +109,9 @@ public abstract class JavaToolchainProvider implements TransitiveInfoProvider {
   /** Returns the {@link Artifact} of the javac jar */
   public abstract Artifact getJavac();
 
+  /** Returns the {@link Artifact}s of compilation tools. */
+  public abstract NestedSet<Artifact> getTools();
+
   /** Returns the {@link Artifact} of the JavaBuilder deploy jar */
   public abstract Artifact getJavaBuilder();