aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
diff options
context:
space:
mode:
authorGravatar mstaib <mstaib@google.com>2017-07-06 19:27:22 -0400
committerGravatar John Cater <jcater@google.com>2017-07-07 07:08:23 -0400
commit62d9276be1a3c4840dc8dd8839480308528f97c1 (patch)
tree186ad8f8002e9b08a36517b5a7e3aadbaa51e72c /src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
parent490b0956e6cc8449072f3010c5197d9d6c621d09 (diff)
Remove FragmentOptions' addAllLabels and getAllLabels and friends.
These are now dead code - configuration dependencies are loaded by Skyframe and do not need to be listed ahead of time - and were only ever used in tests. PiperOrigin-RevId: 161146721
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index 33ba628d1f..2d52cfb10a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.java;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelMapConverter;
@@ -24,7 +23,6 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration.StrictDe
import com.google.devtools.build.lib.analysis.config.DefaultsPackage;
import com.google.devtools.build.lib.analysis.config.FragmentOptions;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaOptimizationMode;
import com.google.devtools.build.lib.rules.java.JavaConfiguration.OneVersionEnforcementLevel;
@@ -543,17 +541,6 @@ public class JavaOptions extends FragmentOptions {
}
@Override
- public void addAllLabels(Multimap<String, Label> labelMap) {
- addOptionalLabel(labelMap, "jdk", javaBase);
- addOptionalLabel(labelMap, "jdk", hostJavaBase);
- if (javaLauncher != null) {
- labelMap.put("java_launcher", javaLauncher);
- }
- labelMap.put("java_toolchain", javaToolchain);
- labelMap.putAll("translation", getTranslationLabels());
- }
-
- @Override
public Map<String, Set<Label>> getDefaultsLabels(BuildConfiguration.Options commonOptions) {
Set<Label> jdkLabels = new LinkedHashSet<>();
DefaultsPackage.parseAndAdd(jdkLabels, javaBase);
@@ -564,17 +551,4 @@ public class JavaOptions extends FragmentOptions {
return result;
}
-
- private Set<Label> getTranslationLabels() {
- Set<Label> result = new LinkedHashSet<>();
- for (String s : translationTargets) {
- try {
- Label label = Label.parseAbsolute(s);
- result.add(label);
- } catch (LabelSyntaxException e) {
- // We ignore this exception here - it will cause an error message at a later time.
- }
- }
- return result;
- }
}