aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules
diff options
context:
space:
mode:
authorGravatar cparsons <cparsons@google.com>2017-04-07 17:38:12 +0000
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-04-10 11:44:04 +0200
commit80f32bac3145125490706a71a28caa30f189bcd2 (patch)
treeee55f44cde179078cb0a2407a2d571bfda81a12b /src/main/java/com/google/devtools/build/lib/rules
parente193df0aa45e84f08fb2f0df65f076d8c3fd844e (diff)
Remove static declaration of apple split transitions, as this is no longer necessary with dynamic configurations
RELNOTES: None. PiperOrigin-RevId: 152515642
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java9
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java15
2 files changed, 1 insertions, 23 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 8e26a2e34a..fdf7e2333d 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
@@ -108,15 +108,6 @@ public class MultiArchSplitTransitionProvider implements SplitTransitionProvider
}
/**
- * Returns the full list of potential split transitions this split transition provider may
- * produce.
- */
- public static List<SplitTransition<BuildOptions>> getPotentialSplitTransitions() {
- return ImmutableList.<SplitTransition<BuildOptions>>copyOf(
- SPLIT_TRANSITIONS_BY_TYPE.values());
- }
-
- /**
* Transition that results in one configured target per architecture specified in the
* platform-specific cpu flag for a particular platform type (for example, --watchos_cpus
* for watchos platform type).
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
index 1374a6798c..b883b69f94 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
@@ -14,17 +14,15 @@
package com.google.devtools.build.lib.rules.objc;
-import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter;
-import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.FragmentOptions;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
import com.google.devtools.build.lib.rules.apple.DottedVersion;
import com.google.devtools.build.lib.rules.apple.DottedVersionConverter;
import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
import com.google.devtools.common.options.EnumConverter;
import com.google.devtools.common.options.Option;
+
import java.util.List;
/**
@@ -323,15 +321,4 @@ public class ObjcCommandLineOptions extends FragmentOptions {
host.objcHeaderScannerTool = this.objcHeaderScannerTool;
return host;
}
-
- @SuppressWarnings("unchecked")
- @Override
- public List<SplitTransition<BuildOptions>> getPotentialSplitTransitions() {
- return ImmutableList.<SplitTransition<BuildOptions>>builder().add(
- IosApplication.SPLIT_ARCH_TRANSITION, IosExtension.MINIMUM_OS_AND_SPLIT_ARCH_TRANSITION,
- AppleWatch1Extension.MINIMUM_OS_AND_SPLIT_ARCH_TRANSITION,
- AppleCrosstoolSplitTransition.APPLE_CROSSTOOL_SPLIT_TRANSITION)
- .addAll(MultiArchSplitTransitionProvider.getPotentialSplitTransitions())
- .build();
- }
}