Remove static declaration of apple split transitions, as this is no l…

…onger necessary with dynamic configurations RELNOTES: None. PiperOrigin-RevId: 152515642
sunxingxingtf · Apr 10, 2017 · 80f32ba · 80f32ba
1 parent e193df0
commit 80f32ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 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
@@ -107,15 +107,6 @@ public SplitTransition<?> apply(Rule fromRule) {
     return SPLIT_TRANSITIONS_BY_TYPE.get(platformType);
   }
 
-  /**
-   * 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

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
@@ -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 FragmentOptions getHost(boolean fallback) {
     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();
-  }
 }
diff --git a/src/test/shell/bazel/apple/bazel_apple_test.sh b/src/test/shell/bazel/apple/bazel_apple_test.sh
@@ -766,8 +766,8 @@ EOF
 
   bazel build --verbose_failures --xcode_version=$XCODE_VERSION -s \
       //ios:bin >$TEST_log 2>&1 || fail "should build"
-  expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/apl-ios_x86_64-fastbuild/genfiles/ios/dep/_objs/ios_dep.swiftmodule"
-  expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/apl-ios_x86_64-fastbuild/genfiles/ios/swift_lib/_objs/ios_swift_lib.swiftmodule"
+  expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/local-fastbuild/genfiles/ios/dep/_objs/ios_dep.swiftmodule"
+  expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/local-fastbuild/genfiles/ios/swift_lib/_objs/ios_swift_lib.swiftmodule"
 }
 
 function test_swiftc_script_mode() {

diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -173,7 +173,7 @@ function test_packages_cleared() {
   [[ "$package_count" -ge 10 ]] \
       || fail "package count $package_count too low: did you move/rename the class?"
   local glob_count="$(extract_histogram_count "$histo_file" "GlobValue")"
-  [[ "$glob_count" -ge 30 ]] \
+  [[ "$glob_count" -ge 8 ]] \
       || fail "glob count $glob_count too low: did you move/rename the class?"
   local env_count="$(extract_histogram_count "$histo_file" \
       'Environment\$Extension$')"