From 6bc35ede0ad645cff2eeee133cae3bb25b537219 Mon Sep 17 00:00:00 2001 From: gregce Date: Fri, 22 Dec 2017 11:51:39 -0800 Subject: Replace Attribute.SplitTransition with config.transitions.SplitTransition. PiperOrigin-RevId: 179948322 --- .../devtools/build/lib/rules/android/AndroidRuleClasses.java | 8 +++----- .../devtools/build/lib/rules/android/AndroidSkylarkCommon.java | 5 ++--- .../build/lib/rules/objc/MultiArchSplitTransitionProvider.java | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index 6a8a0a9eb2..c08da7a41f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -37,13 +37,13 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.config.HostTransition; +import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition; import com.google.devtools.build.lib.analysis.config.transitions.Transition; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.Attribute.AllowedValueSet; import com.google.devtools.build.lib.packages.Attribute.LateBoundDefault; -import com.google.devtools.build.lib.packages.Attribute.SplitTransition; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.SafeImplicitOutputsFunction; import com.google.devtools.build.lib.packages.Rule; @@ -206,11 +206,9 @@ public final class AndroidRuleClasses { (rule, attributes, configuration) -> configuration.getSdk()); } - public static final SplitTransition ANDROID_SPLIT_TRANSITION = - new AndroidSplitTransition(); + public static final SplitTransition ANDROID_SPLIT_TRANSITION = new AndroidSplitTransition(); - private static final class AndroidSplitTransition - implements SplitTransition, SkylarkValue { + private static final class AndroidSplitTransition implements SplitTransition, SkylarkValue { private static void setCrosstoolToAndroid(BuildOptions output, BuildOptions input) { AndroidConfiguration.Options inputAndroidOptions = input.get(AndroidConfiguration.Options.class); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java index fe8a9dd36d..be66ad689c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java @@ -14,8 +14,7 @@ package com.google.devtools.build.lib.rules.android; import com.google.devtools.build.lib.actions.Artifact; -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.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.vfs.PathFragment; @@ -47,7 +46,7 @@ public class AndroidSkylarkCommon { + "the --fat_apk_cpu and --android_crosstool_top flags.", structField = true ) - public SplitTransition getAndroidSplitTransition() { + public SplitTransition getAndroidSplitTransition() { return AndroidRuleClasses.ANDROID_SPLIT_TRANSITION; } } 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 { + protected static class AppleBinaryTransition implements SplitTransition { private final PlatformType platformType; // TODO(b/37096178): This should be a mandatory attribute. -- cgit v1.2.3