diff --git a/cc/toolchains/action_type_config.bzl b/cc/toolchains/action_type_config.bzl index fa2fc50..4752ac2 100644 --- a/cc/toolchains/action_type_config.bzl +++ b/cc/toolchains/action_type_config.bzl @@ -17,7 +17,6 @@ load( "//cc/toolchains/impl:collect.bzl", "collect_action_types", "collect_features", - "collect_files", "collect_tools", ) load( @@ -36,7 +35,6 @@ def _cc_action_type_config_impl(ctx): tools = tuple(collect_tools(ctx, ctx.attr.tools)) implies = collect_features(ctx.attr.implies) - files = collect_files(ctx.attr.data) configs = {} for action_type in collect_action_types(ctx.attr.action_types).to_list(): @@ -45,9 +43,7 @@ def _cc_action_type_config_impl(ctx): action_type = action_type, tools = tools, implies = implies, - files = ctx.runfiles( - transitive_files = depset(transitive = [files]), - ).merge_all([tool.runfiles for tool in tools]), + files = ctx.runfiles().merge_all([tool.runfiles for tool in tools]), ) return [ActionTypeConfigSetInfo(label = ctx.label, configs = configs)] @@ -80,14 +76,6 @@ satisfy the currently enabled feature set is used. providers = [FeatureSetInfo], doc = "Features that should be enabled when this action is used.", ), - "data": attr.label_list( - allow_files = True, - doc = """Files required for this action type. - -For example, the c-compile action type might add the C standard library header -files from the sysroot. -""", - ), }, provides = [ActionTypeConfigSetInfo], doc = """Declares the configuration and selection of `cc_tool` rules. diff --git a/tests/rule_based_toolchain/action_type_config/BUILD b/tests/rule_based_toolchain/action_type_config/BUILD index 689babd..3c44113 100644 --- a/tests/rule_based_toolchain/action_type_config/BUILD +++ b/tests/rule_based_toolchain/action_type_config/BUILD @@ -7,9 +7,6 @@ util.helper_target( cc_action_type_config, name = "file_map", action_types = ["//tests/rule_based_toolchain/actions:all_compile"], - data = [ - "//tests/rule_based_toolchain/testdata:multiple2", - ], tools = [ "//tests/rule_based_toolchain/testdata:bin_wrapper.sh", "//tests/rule_based_toolchain/tool:wrapped_tool", diff --git a/tests/rule_based_toolchain/action_type_config/action_type_config_test.bzl b/tests/rule_based_toolchain/action_type_config/action_type_config_test.bzl index bbb5de4..3394ee2 100644 --- a/tests/rule_based_toolchain/action_type_config/action_type_config_test.bzl +++ b/tests/rule_based_toolchain/action_type_config/action_type_config_test.bzl @@ -28,19 +28,16 @@ _TOOL_FILES = [ "tests/rule_based_toolchain/testdata/bin_wrapper", "tests/rule_based_toolchain/testdata/bin_wrapper.sh", ] -_ADDITIONAL_FILES = [ - "tests/rule_based_toolchain/testdata/multiple2", -] collect_action_type_configs = result_fn_wrapper(_collect_action_type_configs) def _files_taken_test(env, targets): configs = env.expect.that_target(targets.file_map).provider(ActionTypeConfigSetInfo).configs() c_compile = configs.get(targets.c_compile[ActionTypeInfo]) - c_compile.files().contains_exactly(_TOOL_FILES + _ADDITIONAL_FILES) + c_compile.files().contains_exactly(_TOOL_FILES) cpp_compile = configs.get(targets.cpp_compile[ActionTypeInfo]) - cpp_compile.files().contains_exactly(_TOOL_FILES + _ADDITIONAL_FILES) + cpp_compile.files().contains_exactly(_TOOL_FILES) def _merge_distinct_configs_succeeds_test(env, targets): configs = env.expect.that_value(