From fd00638483d9c5f6683f6a8bac9278c92f86d5d5 Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Sat, 15 Jul 2017 04:35:28 +0200
Subject: Fix java_toolchain.jvm_opts label expansion if javac is an alias

PiperOrigin-RevId: 162039650
---
 .../google/devtools/build/lib/rules/java/JavaToolchain.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java
index 65169ab536..550263dd05 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java
@@ -32,6 +32,7 @@ import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
+import com.google.devtools.build.lib.rules.AliasProvider;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.rules.java.JavaToolchainData.SupportsWorkers;
 import com.google.devtools.build.lib.syntax.Type;
@@ -75,10 +76,11 @@ public final class JavaToolchain implements RuleConfiguredTargetFactory {
     NestedSet<Artifact> tools = PrerequisiteArtifacts.nestedSet(ruleContext, "tools", Mode.HOST);
 
     TransitiveInfoCollection javacDep = ruleContext.getPrerequisite("javac", Mode.HOST);
-    List<String> jvmOpts = getJvmOpts(
-        ruleContext,
-        ImmutableMap.<Label, ImmutableCollection<Artifact>>of(
-            javacDep.getLabel(), ImmutableList.of(javac)));
+    List<String> jvmOpts =
+        getJvmOpts(
+            ruleContext,
+            ImmutableMap.<Label, ImmutableCollection<Artifact>>of(
+                AliasProvider.getDependencyLabel(javacDep), ImmutableList.of(javac)));
 
     JavaToolchainData toolchainData =
         new JavaToolchainData(
-- 
cgit v1.2.3