diff options
| author |  cushon <cushon@google.com> | 2017-07-15 04:35:28 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-17 10:11:10 +0200 |
| commit | fd00638483d9c5f6683f6a8bac9278c92f86d5d5 (patch) | |
| tree | f14ec8edafa2ce9142aa1b7966653b9627ab3ece | |
| parent | d448b64ac995efbedd5d0f61fa150f55d3992678 (diff) | |
Fix java_toolchain.jvm_opts label expansion if javac is an alias
PiperOrigin-RevId: 162039650
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java | 10 |
1 files changed, 6 insertions, 4 deletions
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( |