diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/transitions')
3 files changed, 31 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java index d58bafd917..d36968c21b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java @@ -70,9 +70,7 @@ public class ComposingSplitTransition implements SplitTransition { */ // TODO(gregce): move this somewhere more general. This isn't intrinsic to composed splits. static List<BuildOptions> apply(BuildOptions fromOptions, Transition transition) { - if (transition == ConfigurationTransitionProxy.NONE) { - return ImmutableList.<BuildOptions>of(fromOptions); - } else if (transition instanceof PatchTransition) { + if (transition instanceof PatchTransition) { return ImmutableList.<BuildOptions>of(((PatchTransition) transition).apply(fromOptions)); } else if (transition instanceof SplitTransition) { SplitTransition split = (SplitTransition) transition; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java index 6a19b36fbb..81baf16503 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java @@ -22,9 +22,6 @@ package com.google.devtools.build.lib.analysis.config.transitions; */ @Deprecated public enum ConfigurationTransitionProxy implements Transition { - /** No transition, i.e., the same configuration as the current. */ - NONE, - /** Transition from the target configuration to the data configuration. */ // TODO(bazel-team): Move this elsewhere. DATA, diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java new file mode 100644 index 0000000000..d5581e5469 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java @@ -0,0 +1,30 @@ +// Copyright 2018 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.config.transitions; + +import com.google.devtools.build.lib.analysis.config.BuildOptions; + +/** + * No-op configuration transition. + */ +public final class NoTransition implements PatchTransition { + public static final NoTransition INSTANCE = new NoTransition(); + + private NoTransition() {} + + @Override + public BuildOptions apply(BuildOptions options) { + return options; + } +} |