Add cc_import.defines

Fixes #19753

Author: keith

src/main/starlark/builtins_bzl/common/cc/cc_import.bzl

@@ -165,6 +165,7 @@ def _cc_import_impl(ctx):
         public_hdrs = ctx.files.hdrs,
         includes = ctx.attr.includes,
         name = ctx.label.name,
+        defines = cc_helper.defines(ctx, {}),
     )
 
     this_cc_info = CcInfo(compilation_context = compilation_context, linking_context = linking_context)
@@ -416,6 +417,16 @@ most build rules</a>."""),
             allow_files = True,
             flags = ["SKIP_CONSTRAINTS_OVERRIDE"],
         ),
+        "defines": attr.string_list(doc = """
+List of defines to add to the compile line of this and all dependent targets.
+Subject to <a href="${link make-variables}">"Make" variable</a> substitution and
+<a href="${link common-definitions#sh-tokenization}">Bourne shell tokenization</a>.
+Each string, which must consist of a single Bourne shell token,
+is prepended with <code>-D</code> and added to the compile command line to this target,
+as well as to every rule that depends on it. Be very careful, since this may have
+far-reaching effects -- the defines are added to every target that depends on
+this target.
+"""),
         "_use_auto_exec_groups": attr.bool(default = True),
     },
     provides = [CcInfo],

src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test/BUILD.builtin_test

@@ -44,6 +44,18 @@ cc_test(
     deps = [":static_import"],
 )
 
+cc_import(
+    name = "lib_with_define",
+    defines = ["IMPORT_DEFINE"],
+    static_library = ":lib_only",
+)
+
+cc_test(
+    name = "define_test",
+    srcs = ["require_define.cc"],
+    deps = [":lib_with_define"],
+)
+
 sh_test(
     name = "cc_static_library_integration_test",
     srcs = [

src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test/require_define.cc

@@ -0,0 +1,7 @@
+#ifndef IMPORT_DEFINE
+#error "Missing expected IMPORT_DEFINE"
+#endif
+
+int main() {
+  return 0;
+}