Skip to content

Commit a76763c

Browse files
comiuscopybara-github
authored andcommitted
Remove apple_common.multi_arch_split
Remove the apple_binary and apple_static_library tests. The tests involved hardcoded Starlark implementation of apple_binary that diverged from the implementation that is used. Add a simple hardcoded implementation of the apple_platform_split_transition to tests. This keep the coverage of objc rules that are in builtins. (Also the implementations of multi_arch_split has diverged from apple_platform_split_transition). RELNOTES[INC]: Removed multi_arch_split, use transition_support.apple_platform_split_transition from rules_apple instead. https://github.com/bazelbuild/rules_apple/blob/master/apple/internal/transition_support.bzl#L608 PiperOrigin-RevId: 553171946 Change-Id: I874e8b9e39b291774a74b0192926521a3c88c103
1 parent d993957 commit a76763c

File tree

15 files changed

+98
-2832
lines changed

15 files changed

+98
-2832
lines changed

src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.google.devtools.build.lib.rules.cpp.CppSemantics;
4545
import com.google.devtools.build.lib.rules.cpp.UserVariablesExtension;
4646
import com.google.devtools.build.lib.rules.objc.ObjcProvider.Flag;
47-
import com.google.devtools.build.lib.starlarkbuildapi.SplitTransitionProviderApi;
4847
import com.google.devtools.build.lib.starlarkbuildapi.objc.AppleCommonApi;
4948
import java.util.Map;
5049
import javax.annotation.Nullable;
@@ -169,11 +168,6 @@ public ImmutableMap<String, String> getTargetAppleEnvironment(
169168
platform, xcodeConfig.getSdkVersionForPlatform(platform));
170169
}
171170

172-
@Override
173-
public SplitTransitionProviderApi getMultiArchSplitProvider() {
174-
return new MultiArchSplitTransitionProvider();
175-
}
176-
177171
@Override
178172
// This method is registered statically for Starlark, and never called directly.
179173
public ObjcProvider newObjcProvider(Dict<String, Object> kwargs, StarlarkThread thread)

src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java

Lines changed: 0 additions & 206 deletions
This file was deleted.

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleCommonApi.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.google.devtools.build.lib.analysis.config.transitions.StarlarkExposedRuleTransitionFactory;
2121
import com.google.devtools.build.lib.collect.nestedset.Depset;
2222
import com.google.devtools.build.lib.starlarkbuildapi.FileApi;
23-
import com.google.devtools.build.lib.starlarkbuildapi.SplitTransitionProviderApi;
2423
import com.google.devtools.build.lib.starlarkbuildapi.StarlarkRuleContextApi;
2524
import com.google.devtools.build.lib.starlarkbuildapi.apple.ApplePlatformApi;
2625
import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleToolchainApi;
@@ -217,27 +216,6 @@ public interface AppleCommonApi<
217216
ImmutableMap<String, String> getTargetAppleEnvironment(
218217
XcodeConfigInfoApiT xcodeConfig, ApplePlatformApiT platform);
219218

220-
@StarlarkMethod(
221-
name = "multi_arch_split",
222-
doc =
223-
"A configuration transition for rule attributes to build dependencies in one or more"
224-
+ " Apple platforms. <p>Use of this transition requires that the 'platform_type' and"
225-
+ " 'minimum_os_version' string attributes are defined and mandatory on the"
226-
+ " rule.</p><p>The value of the platform_type attribute will dictate the target"
227-
+ " architectures for which dependencies along this configuration transition will"
228-
+ " be built.</p><p>Options are:</p><ul><li><code>ios</code>: architectures gathered"
229-
+ " from <code>--ios_multi_cpus</code>.</li><li><code>macos</code>: architectures"
230-
+ " gathered from <code>--macos_cpus</code>.</li><li><code>tvos</code>:"
231-
+ " architectures gathered from"
232-
+ " <code>--tvos_cpus</code>.</li><li><code>watchos</code>: architectures gathered"
233-
+ " from <code>--watchos_cpus</code>.</li></ul><p>minimum_os_version should be a"
234-
+ " dotted version string such as '7.3', and is used to set the minimum operating"
235-
+ " system on the configuration similarly based on platform type. For example,"
236-
+ " specifying platform_type 'ios' and minimum_os_version '8.0' will ensure that"
237-
+ " dependencies are built with minimum iOS version '8.0'.",
238-
structField = true)
239-
SplitTransitionProviderApi getMultiArchSplitProvider();
240-
241219
@StarlarkMethod(
242220
name = "new_objc_provider",
243221
doc = "Creates a new ObjcProvider instance.",

0 commit comments

Comments
 (0)