aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2016-03-02 12:09:26 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-03-02 17:55:17 +0000
commit49c101f86531a607c853e90740dbba61bf5ac568 (patch)
treeea262245144c3f2a0d31c4590627b13b0e16234b /src
parent47ceb67404e82637eb9ffa617dbb688ffa098703 (diff)
Don't return the Jvm label as an implicit label from the Jvm fragment.
The production JvmConfigurationLoader never invents Jvm labels, and this is only used for the sanity check that all implicit labels can be derived from explicit labels. Unfortunately, our tests often use the MockJvmFactory, which happily invents Jvm labels. This is a step towards making the sanity check run unconditionally. -- MOS_MIGRATED_REVID=116125095
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java b/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
index 5888013843..e24266db5f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
@@ -15,7 +15,6 @@
package com.google.devtools.build.lib.rules.java;
import com.google.common.collect.ImmutableMap.Builder;
-import com.google.common.collect.Multimap;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -54,13 +53,6 @@ public final class Jvm extends BuildConfiguration.Fragment {
this.java = getJavaHome().getRelative("bin/java" + OsUtils.executableExtension());
}
- @Override
- public void addImplicitLabels(Multimap<String, Label> implicitLabels) {
- if (jvmLabel != null) {
- implicitLabels.put("Jvm", jvmLabel);
- }
- }
-
/**
* Returns a path fragment that determines the path to the installation
* directory. It is either absolute or relative to the execution root.