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/skyframe/SkyframeExecutor.java | |
| 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/skyframe/SkyframeExecutor.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index 34286bde16..c424bd44a3 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -1220,12 +1220,12 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { ConfigurationTransition dataTransition = ((ConfiguredRuleClassProvider) ruleClassProvider).getLipoDataTransition(); BuildOptions dataOptions = dataTransition != NoTransition.INSTANCE - ? ((PatchTransition) dataTransition).apply(firstTargetConfig.getOptions()) + ? ((PatchTransition) dataTransition).patch(firstTargetConfig.getOptions()) : firstTargetConfig.getOptions(); BuildOptions hostOptions = dataOptions.get(BuildConfiguration.Options.class).useDistinctHostConfiguration - ? HostTransition.INSTANCE.apply(dataOptions) + ? HostTransition.INSTANCE.patch(dataOptions) : dataOptions; BuildConfiguration hostConfig = getConfiguration(eventHandler, hostOptions, keepGoing); |