diff options
| author |  gregce <gregce@google.com> | 2017-12-22 11:51:39 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-22 11:53:09 -0800 |
| commit | 6bc35ede0ad645cff2eeee133cae3bb25b537219 (patch) | |
| tree | e270382953a829833604f29de68247e6943c81f1 /src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java | |
| parent | 3080b9423a7c50a3f6716c5421ed42f06e55d3a6 (diff) | |
Replace Attribute.SplitTransition with config.transitions.SplitTransition.
PiperOrigin-RevId: 179948322
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java index 394c2202b7..8284011f06 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java @@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Options; import com.google.devtools.build.lib.analysis.config.BuildOptions; -import com.google.devtools.build.lib.packages.Attribute.SplitTransition; +import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition; import com.google.devtools.build.lib.packages.Attribute.SplitTransitionProvider; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; @@ -125,7 +125,7 @@ public class MultiArchSplitTransitionProvider implements SplitTransitionProvider } @Override - public SplitTransition<?> apply(AttributeMap attrMapper) { + public SplitTransition apply(AttributeMap attrMapper) { String platformTypeString = attrMapper.get(PlatformRule.PLATFORM_TYPE_ATTR_NAME, STRING); String minimumOsVersionString = attrMapper.get(PlatformRule.MINIMUM_OS_VERSION, STRING); PlatformType platformType; @@ -164,7 +164,7 @@ public class MultiArchSplitTransitionProvider implements SplitTransitionProvider * platform-specific cpu flag for a particular platform type (for example, --watchos_cpus * for watchos platform type). */ - protected static class AppleBinaryTransition implements SplitTransition<BuildOptions> { + protected static class AppleBinaryTransition implements SplitTransition { private final PlatformType platformType; // TODO(b/37096178): This should be a mandatory attribute. |