Make JavaToolchain use the new Expander API

Progress on #2475.

PiperOrigin-RevId: 170671644

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
index 9d3fa1d127..46c1493b07 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
@@ -95,6 +95,21 @@ public class LocationExpander {
   }
 
   /**
+   * Creates location expander helper bound to specific target and with default location map.
+   *
+   * @param ruleContext BUILD rule
+   * @param labelMap A mapping of labels to build artifacts.
+   * @param options the list of options, see {@link Options}
+   */
+  public LocationExpander(
+      RuleContext ruleContext, ImmutableMap<Label, ImmutableCollection<Artifact>> labelMap,
+      Options... options) {
+    this.ruleContext = ruleContext;
+    this.options = ImmutableSet.copyOf(options);
+    this.labelMap = labelMap;
+  }
+
+  /**
    * Creates location expander helper bound to specific target.
    *
    * @param ruleContext the BUILD rule's context