diff options
author | gregce <gregce@google.com> | 2018-05-23 12:26:54 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-23 12:28:12 -0700 |
commit | 3e951fcb946b9f8efdef7a84a2fb0fe03ede010e (patch) | |
tree | 07a17bd61e80cd231773253c506fd9a48feb25d0 /src/main/java/com/google/devtools/build/lib/rules/cpp/transitions | |
parent | 5138f9434f87d77d48275c411f5ec5863c8762f9 (diff) |
Rename PatchTransition.apply to PatchTransiton.patch.
This unclashes with the incoming ConfigurationTransition.apply
method described in https://docs.google.com/document/d/1_UJKmAQ9EE8i3Pl0il3YLTYr-Q9EKYYyLatt2zohfyM/edit#heading=h.96gongkwg852.
PiperOrigin-RevId: 197769784
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/transitions')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java index a13f31991c..3fe0e9d0e5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/ContextCollectorOwnerTransition.java @@ -40,7 +40,7 @@ public class ContextCollectorOwnerTransition implements PatchTransition { new ContextCollectorOwnerTransition(); @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { // If this target and its transitive closure don't have C++ options, there's no context // collector configuration to change. if (!options.contains(CppOptions.class)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java index 111207eb42..a69611d9e8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/DisableLipoTransition.java @@ -32,7 +32,7 @@ public final class DisableLipoTransition implements PatchTransition { private DisableLipoTransition() {} @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { // If this target and its transitive closure don't have C++ options, there's no // LIPO context to change. if (!options.contains(CppOptions.class)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java index 883d59cd34..cdd92b9954 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/EnableLipoTransition.java @@ -50,7 +50,7 @@ public class EnableLipoTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { CppOptions cppOptions = options.get(CppOptions.class); if (!cppOptions.isDataConfigurationForLipoOptimization() || !ruleLabel.equals(cppOptions.getLipoContextForBuild())) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java index 138b45ce47..231dcca181 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/transitions/LipoContextCollectorTransition.java @@ -32,7 +32,7 @@ public class LipoContextCollectorTransition implements PatchTransition { private LipoContextCollectorTransition() {} @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { // If this target and its transitive closure don't have C++ options, there's no // LIPO context to change. if (!options.contains(CppOptions.class)) { |