grpc-native: Use header sources from dependency instead of copy (bazel)

Signed-off-by: Johannes Zottele <[email protected]>

Author: Jozott00

cinterop-c/include/kgrpc.h

@@ -23,6 +23,12 @@ typedef struct {
     void *user_data;
 } kgrpc_cb_tag;
 
+
+ /*
+ * Call to grpc_iomgr_run_in_background(), which is not exposed as extern "C" and therefore must be wrapped.
+ */
+ bool kgrpc_iomgr_run_in_background();
+
 #ifdef __cplusplus
     }
 #endif

cinterop-c/prebuilt-deps/grpc_fat/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@rules_cc//cc:defs.bzl", "cc_import", "cc_library")
-load("//:tools/collect_headers.bzl", "include_dir")
+load("//:tools/collect_headers.bzl", "cc_headers_only", "include_dir")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -19,19 +19,24 @@ include_dir(
 
 #### Targets for pre-built dependency ####
 
+# extract only the header files from grpc without compiling it
+cc_headers_only(
+    name = "grpc_hdrs_ccinfo",
+    dep = "@com_github_grpc_grpc//:grpc",
+)
+
 cc_library(
     name = "grpc_core_prebuilt",
-    hdrs = glob(["include/**"]),
-    includes = ["include"],
     visibility = ["//visibility:public"],
-    # pick the right prebuilt .a:
-    deps = select({
-        ":ios_device_arm64": [":grpc_core_ios_arm64"],
-        ":ios_simulator_arm64": [":grpc_core_ios_sim_arm64"],
-        ":ios_simulator_x64": [":grpc_core_ios_x64"],
-        ":macos_arm64": [":grpc_core_macos_arm64"],
-        "//conditions:default": [],
-    }),
+    deps = [":grpc_hdrs_ccinfo"] +
+           # pick the right prebuilt .a:
+           select({
+               ":ios_device_arm64": [":grpc_core_ios_arm64"],
+               ":ios_simulator_arm64": [":grpc_core_ios_sim_arm64"],
+               ":ios_simulator_x64": [":grpc_core_ios_x64"],
+               ":macos_arm64": [":grpc_core_macos_arm64"],
+               "//conditions:default": [],
+           }),
 )
 
 config_setting(

cinterop-c/src/kgrpc.cpp

@@ -1,9 +1,14 @@
 // Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 #include <kgrpc.h>
+#include "src/core/lib/iomgr/iomgr.h"
 
 extern "C" {
 
+    bool kgrpc_iomgr_run_in_background() {
+        return grpc_iomgr_run_in_background();
+    }
+
 }
 
 

cinterop-c/tools/collect_headers.bzl

@@ -28,6 +28,8 @@ def _include_dir_impl(ctx):
     outdir = ctx.actions.declare_directory(ctx.label.name + "_includes")
 
     ctx.actions.write(manifest, "\n".join([f.path for f in hdrs]))
+
+    # copy them to some output directory
     ctx.actions.run_shell(
         inputs = hdrs + [manifest],
         outputs = [outdir],
@@ -57,9 +59,33 @@ PY
         HeaderInfo(headers_dir = outdir, headers = depset(hdrs)),
     ]
 
+# rule to copy the include directory of some target to some location
 include_dir = rule(
     implementation = _include_dir_impl,
     attrs = {
         "target": attr.label(mandatory = True),
     },
 )
+
+def _cc_headers_only_impl(ctx):
+    dep_cc = ctx.attr.dep[CcInfo].compilation_context
+
+    # keep only source headers; this skips generated headers and their actions.
+    all_hdrs = dep_cc.headers.to_list()
+    src_hdrs = [f for f in all_hdrs if getattr(f, "is_source", False)]
+    cc_ctx = cc_common.create_compilation_context(
+        headers = depset(src_hdrs),
+        includes = dep_cc.includes,
+        quote_includes = dep_cc.quote_includes,
+        system_includes = dep_cc.system_includes,
+        framework_includes = dep_cc.framework_includes,
+        defines = dep_cc.defines,
+    )
+    return [CcInfo(compilation_context = cc_ctx)]
+
+# rule to build a CcInfo that only contains the headers of a given CcInfo target.
+# this allows us to combine the headers of the dependency sources with our pre-compiled dependencies.
+cc_headers_only = rule(
+    implementation = _cc_headers_only_impl,
+    attrs = {"dep": attr.label(mandatory = True, providers = [CcInfo])},
+)

gradle-conventions/src/main/kotlin/conventions-root.gradle.kts

@@ -6,7 +6,6 @@ import util.other.isPublicModule
 import util.other.libs
 import util.setupPage
 import util.tasks.*
-import java.io.OutputStream
 import java.nio.file.Path
 import kotlin.io.path.*
 
@@ -116,7 +115,7 @@ gradle.afterProject {
 tasks.register<Exec>("checkBazel") {
     commandLine("which", "bazel")
     isIgnoreExitValue = true
-    standardOutput = OutputStream.nullOutputStream()
+//    standardOutput = ByteArrayOutputStream()
     doLast {
         if (executionResult.get().exitValue != 0) {
             throw GradleException("'bazel' not found on PATH. Please install Bazel (https://bazel.build/).")

gradle-conventions/src/main/kotlin/util/cinterop.kt

@@ -7,6 +7,7 @@ package util
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Exec
 import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.TaskProvider
@@ -76,7 +77,11 @@ fun KotlinMultiplatformExtension.configureCLibDependency(
     project: Project,
     bazelTask: String,
     bazelExtractIncludeTask: String? = null,
+    bazelExtractIncludeOutputDir: Provider<Directory>? = null,
 ) {
+    require((bazelExtractIncludeTask == null) == (bazelExtractIncludeOutputDir == null)) {
+        "Either both bazelExtractIncludeTask and bazelExtractIncludeOutputDir must be specified or neither."
+    }
     val buildTargetName = bazelTask.split(":").last()
     val prebuiltLibDir = project.cLibPrebuiltDepsDir.resolve(buildTargetName)
 
@@ -102,16 +107,17 @@ fun KotlinMultiplatformExtension.configureCLibDependency(
     }
 
     if (bazelExtractIncludeTask != null) {
+        val includeDir = bazelExtractIncludeOutputDir!!.get().asFile
         project.tasks.register<Exec>("buildIncludeDirCLib${buildTargetName.capitalized()}") {
             dependsOn(":checkBazel")
             group = "build"
             workingDir = project.cinteropLibDir
             commandLine(
                 "bash",
                 "-c",
-                "./extract_include_dir.sh //prebuilt-deps/grpc_fat:grpc_include_dir $prebuiltLibDir"
+                "./extract_include_dir.sh //prebuilt-deps/grpc_fat:grpc_include_dir $includeDir"
             )
-            outputs.dir(prebuiltLibDir.resolve("include"))
+            outputs.dir(includeDir.resolve("include"))
         }
     }
 

grpc/grpc-core/build.gradle.kts

@@ -71,6 +71,8 @@ kotlin {
         }
     }
 
+
+    val grpcIncludeDir = project.layout.buildDirectory.dir("bazel-out/grpc-include")
     configureCLibCInterop(project, ":kgrpc") { cLibSource, cLibOutDir ->
         val grpcPrebuiltDir = cLibSource.resolve("prebuilt-deps/grpc_fat")
 
@@ -88,7 +90,8 @@ kotlin {
     configureCLibDependency(
         project,
         bazelTask = "//prebuilt-deps/grpc_fat:grpc_fat",
-        bazelExtractIncludeTask = "//prebuilt-deps/grpc_fat:grpc_include_dir"
+        bazelExtractIncludeTask = "//prebuilt-deps/grpc_fat:grpc_include_dir",
+        bazelExtractIncludeOutputDir = grpcIncludeDir,
     )
 
 }