Skip to content

Commit

Permalink
Remove unused code from Objc Starlark built-ins.
Browse files Browse the repository at this point in the history
Flagged by buildifier warnings and code inspection.

RELNOTES: N/A
PiperOrigin-RevId: 443709082
  • Loading branch information
Googler authored and copybara-github committed Apr 22, 2022
1 parent 18c17da commit bc0eb51
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ objc_internal = _builtins.internal.objc_internal
cc_common = _builtins.toplevel.cc_common

def _build_variable_extensions(
common_variables,
ctx,
intermediate_artifacts,
variable_categories,
Expand Down Expand Up @@ -85,7 +84,6 @@ def _build_common_variables(
compilation_artifacts = objc_internal.create_compilation_artifacts(ctx = ctx)

(objc_provider, objc_compilation_context) = objc_common.create_context_and_provider(
purpose = "COMPILE_AND_LINK",
ctx = ctx,
compilation_attributes = compilation_attributes,
compilation_artifacts = compilation_artifacts,
Expand All @@ -109,7 +107,6 @@ def _build_common_variables(
disable_layering_check = disable_layering_check,
disable_parse_headers = disable_parse_hdrs,
objc_config = ctx.fragments.objc,
apple_config = ctx.fragments.apple,
objc_provider = objc_provider,
)

Expand Down Expand Up @@ -294,7 +291,6 @@ def _register_compile_and_archive_actions_for_j2objc(
disable_layering_check = True,
disable_parse_headers = True,
objc_config = ctx.fragments.objc,
apple_config = ctx.fragments.apple,
objc_provider = None,
)
return _register_compile_and_archive_actions(
Expand Down Expand Up @@ -385,7 +381,6 @@ def _cc_compile_and_link(
purpose = "{}_objc_arc".format(_get_purpose(common_variables))
arc_primary_module_map_fc = feature_configuration
arc_extensions = _build_variable_extensions(
common_variables,
ctx,
intermediate_artifacts,
variable_categories,
Expand Down Expand Up @@ -413,7 +408,6 @@ def _cc_compile_and_link(
support_parse_headers = False,
)
non_arc_extensions = _build_variable_extensions(
common_variables,
ctx,
intermediate_artifacts,
variable_categories,
Expand Down Expand Up @@ -589,7 +583,6 @@ def _register_fully_link_action(common_variables, objc_provider, name):

output_archive = ctx.actions.declare_file(name + ".a")
extensions = _build_variable_extensions(
common_variables,
ctx,
common_variables.intermediate_artifacts,
["FULLY_LINK_VARIABLES"],
Expand Down
8 changes: 0 additions & 8 deletions src/main/starlark/builtins_bzl/common/objc/objc_common.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ CcInfo = _builtins.toplevel.CcInfo
apple_common = _builtins.toplevel.apple_common

def _create_context_and_provider(
purpose,
ctx,
compilation_attributes,
compilation_artifacts,
Expand Down Expand Up @@ -230,13 +229,6 @@ def _add_linkopts(objc_provider_kwargs, link_opts):
),
)

def _compilation_contexts_from_cc_infos(cc_infos):
cc_compilation_contexts = []
for cc_info in cc_infos:
cc_compilation_contexts.append(cc_info.compilation_context)

return cc_compilation_contexts

objc_common = struct(
create_context_and_provider = _create_context_and_provider,
)

0 comments on commit bc0eb51

Please sign in to comment.