Relax SplitTransitionProvider interface to use AttributeMap RELNOTES: None. PiperOrigin-RevId: 172394552
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java index 1f8313c..bc35b3a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -188,7 +188,7 @@ /** * Transition to one or more configurations. To obtain the actual child configurations, - * invoke {@link Attribute#getSplitTransition(ConfiguredAttributeMapper)}. + * invoke {@link Attribute#getSplitTransition(AttributeMap)}. * See {@link SplitTransition}. **/ SPLIT @@ -320,7 +320,7 @@ /** * Returns the {@link SplitTransition} given the attribute mapper of the originating rule. */ - SplitTransition<?> apply(ConfiguredAttributeMapper attributeMap); + SplitTransition<?> apply(AttributeMap attributeMap); } /** @@ -336,7 +336,7 @@ } @Override - public SplitTransition<?> apply(ConfiguredAttributeMapper attributeMap) { + public SplitTransition<?> apply(AttributeMap attributeMap) { return splitTransition; } } @@ -1959,7 +1959,7 @@ * @return a SplitTransition<BuildOptions> object * @throws IllegalStateException if {@link #hasSplitConfigurationTransition} is not true */ - public SplitTransition<?> getSplitTransition(ConfiguredAttributeMapper attributeMapper) { + public SplitTransition<?> getSplitTransition(AttributeMap attributeMapper) { Preconditions.checkState(hasSplitConfigurationTransition()); return splitTransitionProvider.apply(attributeMapper); }
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 cc80e1b..7d0e9af 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
@@ -26,7 +26,7 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.packages.Attribute.SplitTransition; import com.google.devtools.build.lib.packages.Attribute.SplitTransitionProvider; -import com.google.devtools.build.lib.packages.ConfiguredAttributeMapper; +import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; @@ -123,7 +123,7 @@ } @Override - public SplitTransition<?> apply(ConfiguredAttributeMapper 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;
diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java index 6d259f4..8e6a6cd 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -301,7 +301,7 @@ private static class TestSplitTransitionProvider implements SplitTransitionProvider { @Override - public SplitTransition<?> apply(ConfiguredAttributeMapper attrMapper) { + public SplitTransition<?> apply(AttributeMap attrMapper) { return new TestSplitTransition(); } }