From ca8b39895bda7a48d7765b97ff9491794cb34edc Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 4 Sep 2023 11:59:00 -0700 Subject: [PATCH] BEGIN_PUBLIC Clean grep_includes END_PUBLIC grep_includes is moved to a cc_toolchain and there is no need anymore to specify it as a rule's attribute. PiperOrigin-RevId: 562592157 Change-Id: I24415282639a6a51d3269fd8056c1b556c728456 --- .../builtins_bzl/common/cc/cc_binary_attrs.bzl | 1 - src/main/starlark/builtins_bzl/common/cc/cc_common.bzl | 4 +--- src/main/starlark/builtins_bzl/common/cc/cc_import.bzl | 6 ------ .../starlark/builtins_bzl/common/cc/cc_library.bzl | 6 ------ .../builtins_bzl/common/cc/cc_proto_library.bzl | 1 - .../builtins_bzl/common/cc/cc_shared_library.bzl | 6 ------ .../starlark/builtins_bzl/common/java/java_binary.bzl | 1 - src/main/starlark/builtins_bzl/common/objc/attrs.bzl | 10 ---------- .../starlark/builtins_bzl/common/objc/objc_import.bzl | 1 - .../starlark/builtins_bzl/common/objc/objc_library.bzl | 1 - .../build/lib/rules/objc/ObjcRuleTestCase.java | 6 ------ 11 files changed, 1 insertion(+), 42 deletions(-) diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_binary_attrs.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_binary_attrs.bzl index 27d83a6a0404f5..5b1f6d1083bf77 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_binary_attrs.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_binary_attrs.bzl @@ -91,7 +91,6 @@ cc_binary_attrs_with_aspects = { "licenses": attr.license() if hasattr(attr, "license") else attr.string_list(), "_cc_binary": attr.bool(), "_is_test": attr.bool(default = False), - "_grep_includes": semantics.get_grep_includes(), "_stl": semantics.get_stl(), "_cc_toolchain": attr.label(default = "@" + semantics.get_repo() + "//tools/cpp:current_cc_toolchain"), "_cc_toolchain_type": attr.label(default = "@" + semantics.get_repo() + "//tools/cpp:toolchain_type"), diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl index a8c4c945c8fd4a..4f361e2e362482 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl @@ -669,8 +669,7 @@ def _register_linkstamp_compile_action( compilation_inputs, inputs_for_validation, label_replacement, - output_replacement, - grep_includes = None): + output_replacement): cc_common_internal.check_private_api(allowlist = _PRIVATE_STARLARKIFICATION_ALLOWLIST) return cc_common_internal.register_linkstamp_compile_action( actions = actions, @@ -864,7 +863,6 @@ def _create_compile_action( action_name, compilation_context, additional_inputs = None, - grep_includes = None, additional_outputs = []): cc_common_internal.check_private_api(allowlist = _CREATE_COMPILE_ACTION_API_ALLOWLISTED_PACKAGES) return cc_common_internal.create_compile_action( diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl index 24320f3a04aca7..7aab817445c188 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_import.bzl @@ -199,12 +199,6 @@ cc_import = rule( allow_files = True, flags = ["SKIP_CONSTRAINTS_OVERRIDE"], ), - "_grep_includes": attr.label( - allow_files = True, - executable = True, - cfg = "exec", - default = Label("@" + semantics.get_repo() + "//tools/cpp:grep-includes"), - ), "_cc_toolchain": attr.label(default = "@" + semantics.get_repo() + "//tools/cpp:current_cc_toolchain"), "_use_auto_exec_groups": attr.bool(default = True), }, diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl index 76bea37fecd208..fe827d3db78d0e 100755 --- a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl @@ -600,12 +600,6 @@ attrs = { flags = ["ORDER_INDEPENDENT", "DIRECT_COMPILE_TIME_INPUT"], ), "_stl": semantics.get_stl(), - "_grep_includes": attr.label( - allow_files = True, - executable = True, - cfg = "exec", - default = Label("@" + semantics.get_repo() + "//tools/cpp:grep-includes"), - ), "_def_parser": semantics.get_def_parser(), "_cc_toolchain": attr.label(default = "@" + semantics.get_repo() + "//tools/cpp:current_cc_toolchain"), "_use_auto_exec_groups": attr.bool(default = True), diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_proto_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_proto_library.bzl index b62f06410362c1..bd99786c1fb86d 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_proto_library.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_proto_library.bzl @@ -90,7 +90,6 @@ def _aspect_impl(target, ctx): # shouldProcessHeaders is set to true everytime, however java implementation of # compile gets this value from cc_toolchain. - # Missing grep_includes, should not be necessary. # Missing stl compilation context, should not be necessary. outputs = [] diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl index dbfb9d89935a88..a722196ee87823 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl @@ -832,12 +832,6 @@ cc_shared_library = rule( "user_link_flags": attr.string_list(), "_def_parser": semantics.get_def_parser(), "_cc_toolchain": attr.label(default = "@" + semantics.get_repo() + "//tools/cpp:current_cc_toolchain"), - "_grep_includes": attr.label( - allow_files = True, - executable = True, - cfg = "exec", - default = Label("@" + semantics.get_repo() + "//tools/cpp:grep-includes"), - ), }, toolchains = cc_helper.use_cpp_toolchain(), fragments = ["cpp"] + semantics.additional_fragments(), diff --git a/src/main/starlark/builtins_bzl/common/java/java_binary.bzl b/src/main/starlark/builtins_bzl/common/java/java_binary.bzl index 4515c92bf73933..5e6861d5359d95 100644 --- a/src/main/starlark/builtins_bzl/common/java/java_binary.bzl +++ b/src/main/starlark/builtins_bzl/common/java/java_binary.bzl @@ -536,7 +536,6 @@ BASIC_JAVA_BINARY_ATTRIBUTES = merge_attrs( allow_single_file = True, ), "_cc_toolchain": attr.label(default = "@" + cc_semantics.get_repo() + "//tools/cpp:current_cc_toolchain"), - "_grep_includes": cc_semantics.get_grep_includes(), "_java_toolchain_type": attr.label(default = semantics.JAVA_TOOLCHAIN_TYPE), }, ) diff --git a/src/main/starlark/builtins_bzl/common/objc/attrs.bzl b/src/main/starlark/builtins_bzl/common/objc/attrs.bzl index 8b8ad8b6a6ea80..1b0c5550223a6a 100644 --- a/src/main/starlark/builtins_bzl/common/objc/attrs.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/attrs.bzl @@ -62,15 +62,6 @@ _COMPILE_DEPENDENCY_RULE = { ), } -_INCLUDE_SCANNING_RULE = { - "_grep_includes": attr.label( - allow_single_file = True, - cfg = "exec", - default = "@" + semantics.get_repo() + "//tools/cpp:grep-includes", - executable = True, - ), -} - _SDK_FRAMEWORK_DEPENDER_RULE = { "sdk_frameworks": attr.string_list(), "weak_sdk_frameworks": attr.string_list(), @@ -98,7 +89,6 @@ common_attrs = struct( COMPILING_RULE = _COMPILING_RULE, COMPILE_DEPENDENCY_RULE = _COMPILE_DEPENDENCY_RULE, COPTS_RULE = _COPTS_RULE, - INCLUDE_SCANNING_RULE = _INCLUDE_SCANNING_RULE, LICENSES = semantics.get_licenses_attr(), SDK_FRAMEWORK_DEPENDER_RULE = _SDK_FRAMEWORK_DEPENDER_RULE, ) diff --git a/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl b/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl index ede447ec9b2e1a..ac29d5af545371 100644 --- a/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/objc_import.bzl @@ -85,7 +85,6 @@ objc_import = rule( common_attrs.ALWAYSLINK_RULE, common_attrs.CC_TOOLCHAIN_RULE, common_attrs.COMPILE_DEPENDENCY_RULE, - common_attrs.INCLUDE_SCANNING_RULE, common_attrs.LICENSES, common_attrs.SDK_FRAMEWORK_DEPENDER_RULE, ), diff --git a/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl b/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl index 3144f34898617e..9e1471389fafd9 100644 --- a/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/objc_library.bzl @@ -129,7 +129,6 @@ objc_library = rule( common_attrs.COMPILING_RULE, common_attrs.COMPILE_DEPENDENCY_RULE, common_attrs.COPTS_RULE, - common_attrs.INCLUDE_SCANNING_RULE, common_attrs.LICENSES, common_attrs.SDK_FRAMEWORK_DEPENDER_RULE, ), diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 9fd0c997be9b4d..016e5638f2b826 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -641,12 +641,6 @@ protected static void addAppleBinaryStarlarkRule(Scratch scratch) throws Excepti " default=Label('" + toolsRepo + "//tools/cpp:current_cc_toolchain'),),", " '_dummy_lib': attr.label(", " default = Label('" + toolsLoc + "/dummy:dummy_lib'),),", - " '_grep_includes': attr.label(", - " cfg = 'exec',", - " allow_single_file = True,", - " executable = True,", - " default = Label('" + toolsRepo + "//tools/cpp:grep-includes'),", - " ),", " '_j2objc_dead_code_pruner': attr.label(", " executable = True,", " allow_files=True,",