Skip to content

Commit 88c8577

Browse files
committed
grpc-native: Add support for iOS/arm64
Signed-off-by: Johannes Zottele <[email protected]>
1 parent 83aa3f1 commit 88c8577

File tree

6 files changed

+28
-14
lines changed

6 files changed

+28
-14
lines changed

cinterop-c/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cc_library(
1515
includes = ["include"],
1616
visibility = ["//visibility:public"],
1717
deps = [
18-
"@com_github_grpc_grpc//:grpc"
18+
"@com_github_grpc_grpc//:grpc",
1919
],
2020
)
2121

cinterop-c/MODULE.bazel

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ bazel_dep(
99
version = "0.1.1",
1010
)
1111

12+
# required to build for apple targets (like iOS)
13+
bazel_dep(name = "apple_support", version = "1.22.1", repo_name = "build_bazel_apple_support")
14+
1215
# Protobuf
1316
bazel_dep(
1417
name = "protobuf",
@@ -19,7 +22,6 @@ bazel_dep(
1922
# gRPC library
2023
bazel_dep(
2124
name = "grpc",
22-
version = "1.73.1",
25+
version = "1.74.1",
2326
repo_name = "com_github_grpc_grpc",
2427
)
25-
bazel_dep(name = "apple_support", version = "1.22.1", repo_name = "build_bazel_apple_support")

cinterop-c/MODULE.bazel.lock

Lines changed: 18 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

grpc/grpc-core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ kotlin {
7979
)
8080
extraOpts(
8181
"-libraryPath", "${cinteropCLib.resolve("bazel-out/darwin_arm64-opt/bin")}",
82+
"-libraryPath", "${cinteropCLib.resolve("out")}",
8283
)
8384
}
8485
}

grpc/grpc-core/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
kotlinx.rpc.exclude.wasmWasi=true
55
kotlinx.rpc.exclude.js=true
66
kotlinx.rpc.exclude.wasmJs=true
7-
kotlinx.rpc.exclude.iosArm64=true
87
kotlinx.rpc.exclude.iosX64=true
9-
kotlinx.rpc.exclude.iosSimulatorArm64=true
108
kotlinx.rpc.exclude.linuxArm64=true
119
kotlinx.rpc.exclude.linuxX64=true
1210
kotlinx.rpc.exclude.macosX64=true

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ headerFilter= kgrpc.h grpc/slice.h grpc/byte_buffer.h grpc/grpc.h \
88
noStringConversion = grpc_slice_from_copied_buffer my_grpc_slice_from_copied_buffer
99
strictEnums = grpc_status_code grpc_connectivity_state grpc_call_error
1010

11-
staticLibraries = libkgrpc_static.a
11+
12+
staticLibraries.macos_arm64 = libkgrpc_static.macos_arm64.a
13+
staticLibraries.ios_arm64 = libkgrpc_static.ios_arm64.a
14+
staticLibraries.ios_simulator_arm64 = libkgrpc_static.ios_sim_arm64.a

0 commit comments

Comments
 (0)