Split OptionsDiffPredicate into a new class.
PiperOrigin-RevId: 307427827
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
index 9c22f04..b3442aa 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -87,19 +87,6 @@
public /*final*/ class ConfiguredRuleClassProvider implements FragmentProvider {
/**
- * Predicate for determining whether the analysis cache should be cleared, given the new and old
- * value of an option which has changed and the values of the other new options.
- */
- @FunctionalInterface
- public interface OptionsDiffPredicate {
- public static final OptionsDiffPredicate ALWAYS_INVALIDATE =
- (options, option, oldValue, newValue) -> true;
-
- public boolean apply(
- BuildOptions newOptions, OptionDefinition option, Object oldValue, Object newValue);
- }
-
- /**
* A coherent set of options, fragments, aspects and rules; each of these may declare a dependency
* on other such sets.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OptionsDiffPredicate.java b/src/main/java/com/google/devtools/build/lib/analysis/OptionsDiffPredicate.java
new file mode 100644
index 0000000..30a3c8d
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/analysis/OptionsDiffPredicate.java
@@ -0,0 +1,28 @@
+// Copyright 2020 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.devtools.build.lib.analysis;
+
+import com.google.devtools.build.lib.analysis.config.BuildOptions;
+import com.google.devtools.common.options.OptionDefinition;
+
+/**
+ * Predicate for determining whether the analysis cache should be cleared, given the new and old
+ * value of an option which has changed and the values of the other new options.
+ */
+@FunctionalInterface
+public interface OptionsDiffPredicate {
+ OptionsDiffPredicate ALWAYS_INVALIDATE = (options, option, oldValue, newValue) -> true;
+
+ boolean apply(BuildOptions newOptions, OptionDefinition option, Object oldValue, Object newValue);
+}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
index ac9cbab..bf59452 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
@@ -18,7 +18,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.OptionsDiffPredicate;
+import com.google.devtools.build.lib.analysis.OptionsDiffPredicate;
import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
import com.google.devtools.build.lib.analysis.config.CoreOptionConverters.LabelConverter;
