diff --git a/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl b/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl index 326eaa28a6a7bb..ddd1550ccf9797 100644 --- a/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl @@ -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, @@ -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, @@ -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, ) @@ -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( @@ -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, @@ -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, @@ -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"], diff --git a/src/main/starlark/builtins_bzl/common/objc/objc_common.bzl b/src/main/starlark/builtins_bzl/common/objc/objc_common.bzl index b8842103ffeffd..3e4201f93d3641 100644 --- a/src/main/starlark/builtins_bzl/common/objc/objc_common.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/objc_common.bzl @@ -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, @@ -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, )