Remove dead code.
PiperOrigin-RevId: 529233830
Change-Id: I12b36619f880570abddf3ca0d4ad0542b2ab3940
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/ShardingEnvironmentFactory.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/ShardingEnvironmentFactory.java
deleted file mode 100644
index 42e7dd0..0000000
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/ShardingEnvironmentFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 The Bazel Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.testing.junit.runner.sharding;
-
-import com.google.testing.junit.runner.util.Factory;
-
-/**
- * A factory that supplies a {@link ShardingEnvironment}.
- */
-public enum ShardingEnvironmentFactory implements Factory<ShardingEnvironment> {
- INSTANCE;
-
- @Override
- public ShardingEnvironment get() {
- return new ShardingEnvironment();
- }
-
- public static Factory<ShardingEnvironment> create() {
- return INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 6f3f695..a919908 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1037,10 +1037,6 @@
this, rule.getPackage(), getConfiguration(), makeVariableSuppliers);
}
- public void initConfigurationMakeVariableContext(MakeVariableSupplier... makeVariableSuppliers) {
- initConfigurationMakeVariableContext(ImmutableList.copyOf(makeVariableSuppliers));
- }
-
public Expander getExpander(TemplateContext templateContext) {
Expander expander = new Expander(this, templateContext);
makeVariableExpanders.add(expander);
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
index 593e839..03c1e99 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
@@ -18,14 +18,12 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.RuleErrorConsumer;
-import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.AspectDescriptor;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.StarlarkProvider;
-import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.cpp.AspectLegalCppSemantics;
import com.google.devtools.build.lib.rules.cpp.CcCommon.Language;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
@@ -36,7 +34,6 @@
import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode;
import com.google.devtools.build.lib.rules.cpp.CppFileTypes;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
-import javax.annotation.Nullable;
import net.starlark.java.eval.EvalException;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.Starlark;
@@ -117,11 +114,6 @@
}
@Override
- public HeadersCheckingMode determineHeadersCheckingMode(RuleContext ruleContext) {
- return HeadersCheckingMode.STRICT;
- }
-
- @Override
public HeadersCheckingMode determineStarlarkHeadersCheckingMode(
RuleContext ruleContext, CppConfiguration cppConfig, CcToolchainProvider toolchain) {
if (cppConfig.strictHeaderCheckingFromStarlark()) {
@@ -154,24 +146,6 @@
}
@Override
- @Nullable
- public StructImpl getCcSharedLibraryInfo(TransitiveInfoCollection dep) {
- StructImpl ccSharedLibraryInfo = (StructImpl) dep.get(CC_SHARED_INFO_PROVIDER);
- if (ccSharedLibraryInfo != null) {
- return ccSharedLibraryInfo;
- }
- ccSharedLibraryInfo = (StructImpl) dep.get(CC_SHARED_INFO_PROVIDER_RULES_CC);
- if (ccSharedLibraryInfo != null) {
- return ccSharedLibraryInfo;
- }
- ccSharedLibraryInfo = (StructImpl) dep.get(CC_SHARED_INFO_PROVIDER_BUILT_INS);
- if (ccSharedLibraryInfo != null) {
- return ccSharedLibraryInfo;
- }
- return null;
- }
-
- @Override
public void validateLayeringCheckFeatures(
RuleContext ruleContext,
AspectDescriptor aspectDescriptor,
@@ -182,18 +156,6 @@
public boolean createEmptyArchive() {
return false;
}
-
- @Override
- public void checkCanUseImplementationDeps(RuleContext ruleContext) {
- boolean experimentalCcImplementationDeps =
- ruleContext.getFragment(CppConfiguration.class).experimentalCcImplementationDeps();
- if (!experimentalCcImplementationDeps
- && ruleContext.attributes().isAttributeValueExplicitlySpecified("implementation_deps")) {
- ruleContext.attributeError(
- "implementation_deps", "requires --experimental_cc_implementation_deps");
- }
- }
-
@Override
public void validateStarlarkCompileApiCall(
StarlarkActionFactory actionFactory,
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
index 4e1ce53..872facf 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
@@ -88,9 +88,6 @@
Template.forResource(BazelJavaSemantics.class, "java_stub_template.txt");
private static final String CLASSPATH_PLACEHOLDER = "%classpath%";
- private static final String JAVABUILDER_CLASS_NAME =
- "com.google.devtools.build.buildjar.BazelJavaBuilder";
-
private static final String JACOCO_COVERAGE_RUNNER_MAIN_CLASS =
"com.google.testing.coverage.JacocoCoverageRunner";
private static final String BAZEL_TEST_RUNNER_MAIN_CLASS =
@@ -678,12 +675,6 @@
}
return ImmutableList.<String>of();
}
-
- @Override
- public String getJavaBuilderMainClass() {
- return JAVABUILDER_CLASS_NAME;
- }
-
@Override
public Artifact getProtoMapping(RuleContext ruleContext) throws InterruptedException {
return null;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
index d2f3bf0..d0b6adb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
@@ -17,12 +17,10 @@
import com.google.common.collect.ImmutableSet;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.RuleErrorConsumer;
-import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory;
import com.google.devtools.build.lib.packages.AspectDescriptor;
import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
-import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.cpp.CcCommon.Language;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode;
@@ -52,9 +50,6 @@
CppCompileActionBuilder actionBuilder,
RuleErrorConsumer ruleErrorConsumer);
- /** Determines the applicable mode of headers checking for the passed in ruleContext. */
- HeadersCheckingMode determineHeadersCheckingMode(RuleContext ruleContext);
-
/** Determines the applicable mode of headers checking in Starlark. */
HeadersCheckingMode determineStarlarkHeadersCheckingMode(
RuleContext ruleContext, CppConfiguration cppConfiguration, CcToolchainProvider toolchain);
@@ -76,9 +71,6 @@
/** Returns true iff this build requires include validation. */
boolean needsIncludeValidation();
- /** Provider for cc_shared_libraries * */
- StructImpl getCcSharedLibraryInfo(TransitiveInfoCollection dep);
-
/** No-op in Bazel */
void validateLayeringCheckFeatures(
RuleContext ruleContext,
@@ -87,9 +79,6 @@
ImmutableSet<String> unsupportedFeatures);
boolean createEmptyArchive();
-
- void checkCanUseImplementationDeps(RuleContext ruleContext);
-
void validateStarlarkCompileApiCall(
StarlarkActionFactory actionFactory,
StarlarkThread thread,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
index 5ef33f8..b47893c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -446,9 +446,6 @@
/** @return a list of extra arguments to appends to the runfiles support. */
List<String> getExtraArguments(RuleContext ruleContext, ImmutableList<Artifact> sources);
- /** @return main class (entry point) for the Java compiler. */
- String getJavaBuilderMainClass();
-
/**
* @return An artifact representing the protobuf-format version of the proguard mapping, or null
* if the proguard version doesn't support this.
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/testing/ExecGroupSubject.java b/src/test/java/com/google/devtools/build/lib/analysis/testing/ExecGroupSubject.java
index 5caae66..acf4431 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/testing/ExecGroupSubject.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/testing/ExecGroupSubject.java
@@ -33,11 +33,6 @@
return assertAbout(ExecGroupSubject::new).that(execGroup);
}
- /** Static method for getting the subject factory (for use with assertAbout()). */
- public static Subject.Factory<ExecGroupSubject, ExecGroup> execGroups() {
- return ExecGroupSubject::new;
- }
-
// Instance fields.
private final ExecGroup actual;
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
index 0e00c45..00a5f60 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
@@ -17,12 +17,10 @@
import com.google.common.collect.ImmutableSet;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.RuleErrorConsumer;
-import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.packages.AspectDescriptor;
-import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.cpp.CcCommon.Language;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode;
@@ -65,11 +63,6 @@
}
@Override
- public HeadersCheckingMode determineHeadersCheckingMode(RuleContext ruleContext) {
- return HeadersCheckingMode.LOOSE;
- }
-
- @Override
public HeadersCheckingMode determineStarlarkHeadersCheckingMode(
RuleContext context, CppConfiguration cppConfig, CcToolchainProvider toolchain) {
return HeadersCheckingMode.LOOSE;
@@ -89,11 +82,6 @@
}
@Override
- public StructImpl getCcSharedLibraryInfo(TransitiveInfoCollection dep) {
- return null;
- }
-
- @Override
public void validateLayeringCheckFeatures(
RuleContext ruleContext,
AspectDescriptor aspectDescriptor,
@@ -104,18 +92,6 @@
public boolean createEmptyArchive() {
return false;
}
-
- @Override
- public void checkCanUseImplementationDeps(RuleContext ruleContext) {
- boolean experimentalCcImplementationDeps =
- ruleContext.getFragment(CppConfiguration.class).experimentalCcImplementationDeps();
- if (!experimentalCcImplementationDeps
- && ruleContext.attributes().isAttributeValueExplicitlySpecified("implementation_deps")) {
- ruleContext.attributeError(
- "implementation_deps", "requires --experimental_cc_implementation_deps");
- }
- }
-
@Override
public void validateStarlarkCompileApiCall(
StarlarkActionFactory actionFactory,
