Skip to content

Commit 54f23fd

Browse files
committed
Update docs
1 parent bdece7e commit 54f23fd

File tree

4 files changed

+19
-23
lines changed

4 files changed

+19
-23
lines changed

rules/BUILD.bazel

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ bzl_library(
9090
visibility = ["//visibility:public"],
9191
deps = [
9292
":transition_support",
93-
":utils.bzl",
93+
":utils",
9494
"@bazel_skylib//lib:partial",
9595
"@bazel_skylib//lib:paths",
9696
"@build_bazel_apple_support//lib:apple_support",
@@ -117,7 +117,7 @@ bzl_library(
117117
":hmap",
118118
":import_middleman",
119119
":precompiled_apple_resource_bundle",
120-
":utils.bzl",
120+
":utils",
121121
"//rules/framework:vfs_overlay",
122122
"//rules/library:resources",
123123
"//rules/library:xcconfig",
@@ -203,3 +203,9 @@ bzl_library(
203203
"@build_bazel_rules_apple//apple:ios",
204204
],
205205
)
206+
207+
bzl_library(
208+
name = "utils",
209+
srcs = ["utils.bzl"],
210+
visibility = ["//visibility:public"],
211+
)

rules/force_load_direct_deps.bzl

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
load("//rules:providers.bzl", "AvoidDepsInfo")
22
load("//rules:transition_support.bzl", "transition_support")
3-
load("//rules:utils.bzl", "supports_objc_provider_linking")
43

54
def _impl(ctx):
65
if not ctx.attr.should_force_load:
76
return [
87
apple_common.new_objc_provider(),
9-
CcInfo()
8+
CcInfo(),
109
]
1110

1211
force_load_libraries = []
@@ -38,17 +37,14 @@ def _impl(ctx):
3837
if not library_to_link in avoid_libraries:
3938
force_load_libraries_to_link.append(library_to_link)
4039

41-
if supports_objc_provider_linking:
42-
legacy_objc_provider = apple_common.new_objc_provider(
43-
force_load_library = depset(force_load_libraries),
44-
link_inputs = depset(force_load_libraries),
45-
)
46-
else:
47-
legacy_objc_provider = apple_common.new_objc_provider()
40+
legacy_objc_provider = apple_common.new_objc_provider(
41+
force_load_library = depset(force_load_libraries),
42+
link_inputs = depset(force_load_libraries),
43+
)
4844

49-
# Set `alwayslink` to `True` for all the libraries that are being force loaded.
50-
for library_to_link in force_load_libraries_to_link:
51-
library_to_link.alwayslink = True
45+
# Set `alwayslink` to `True` for all the libraries that are being force loaded.
46+
for library_to_link in force_load_libraries_to_link:
47+
library_to_link.alwayslink = True
5248

5349
return [
5450
legacy_objc_provider,

rules/internal/objc_provider_utils.bzl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
load("//rules:utils.bzl", "supports_objc_provider_linking")
2-
31
def _add_to_dict_if_present(dict, key, value):
42
if value:
53
dict[key] = value
@@ -53,10 +51,9 @@ def _merge_dynamic_framework_providers(dynamic_framework_providers):
5351
)
5452
_add_to_dict_if_present(fields, key, set)
5553

56-
if supports_objc_provider_linking:
57-
fields["objc"] = apple_common.new_objc_provider()
58-
else:
59-
fields["cc_info"] = CcInfo()
54+
55+
fields["objc"] = apple_common.new_objc_provider()
56+
fields["cc_info"] = CcInfo()
6057

6158
return apple_common.new_dynamic_framework_provider(**fields)
6259

rules/utils.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@ def bundle_identifier_for_bundle(bundle_name):
66
# This is a proxy for being on bazel 7.x.
77
is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition")
88

9-
# This is a proxy for Bazel igration of `ObjcProvider` to `CcInfo`
10-
# This is `False` when `--incompatible_objc_provider_remove_linking_info` is enabled.
11-
supports_objc_provider_linking = hasattr(apple_common.new_objc_provider(), "linkopt")

0 commit comments

Comments
 (0)