grpc-native: Address PR comments

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

Author: Jozott00

cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.macos_x64.a

@@ -0,0 +1 @@
+b1023a3c07c18bd1be3066bd101380d99b56b22a725e15fed6f2bb67e6548765

cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.macos_x64.a.sha256

@@ -21,6 +21,9 @@ ALL_ACTIONS = [
     ACTION_NAMES.cpp_link_static_library,
 ]
 
+# Constructs the toolchain configuration by defining all necessary flags and toolchain wrapper scripts.
+# The wrapper scripts call Konan which delegates all requests to the corresponding clang/llvm tools.
+# Additionally it includes all built-in include directories from the Konan toolchain and sysroot.
 def _impl(ctx):
     target = ctx.attr.target
     home = ctx.var.get("KONAN_HOME")

cinterop-c/toolchain/cc_toolchain_config.bzl

@@ -4,7 +4,6 @@
 kotlinx.rpc.exclude.wasmWasi=true
 kotlinx.rpc.exclude.js=true
 kotlinx.rpc.exclude.wasmJs=true
-kotlinx.rpc.exclude.macosX64=true
 kotlinx.rpc.exclude.mingwX64=true
 kotlinx.rpc.exclude.tvosArm64=true
 kotlinx.rpc.exclude.tvosSimulatorArm64=true

grpc/grpc-core/gradle.properties

@@ -9,6 +9,7 @@ noStringConversion = grpc_slice_from_copied_buffer my_grpc_slice_from_copied_buf
 strictEnums = grpc_status_code grpc_connectivity_state grpc_call_error
 
 staticLibraries.macos_arm64 = libkgrpc.macos_arm64.a libgrpc_fat.macos_arm64.a
+staticLibraries.macos_x64 = libkgrpc.macos_x64.a libgrpc_fat.macos_x64.a
 staticLibraries.ios_arm64 = libkgrpc.ios_arm64.a libgrpc_fat.ios_arm64.a
 staticLibraries.ios_simulator_arm64 = libkgrpc.ios_simulator_arm64.a libgrpc_fat.ios_simulator_arm64.a
 staticLibraries.ios_x64 = libkgrpc.ios_x64.a libgrpc_fat.ios_x64.a

grpc/grpc-core/src/nativeInterop/cinterop/libkgrpc.def

@@ -4,7 +4,6 @@
 kotlinx.rpc.exclude.wasmWasi=true
 kotlinx.rpc.exclude.js=true
 kotlinx.rpc.exclude.wasmJs=true
-kotlinx.rpc.exclude.macosX64=true
 kotlinx.rpc.exclude.mingwX64=true
 kotlinx.rpc.exclude.tvosArm64=true
 kotlinx.rpc.exclude.tvosSimulatorArm64=true

protobuf/protobuf-core/gradle.properties

@@ -5,6 +5,7 @@ noStringConversion = pw_encoder_write_string
 
 
 staticLibraries.macos_arm64 = libprotowire_fat.macos_arm64.a
+staticLibraries.macos_x64 = libprotowire_fat.macos_x64.a
 staticLibraries.ios_arm64 = libprotowire_fat.ios_arm64.a
 staticLibraries.ios_simulator_arm64 = libprotowire_fat.ios_simulator_arm64.a
 staticLibraries.ios_x64 = libprotowire_fat.ios_x64.a