grpc-native: Add ios/x64 support

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

Author: Jozott00

cinterop-c/build_all_targets.sh

@@ -25,6 +25,7 @@ CONFIG=release
 MACOS=@build_bazel_apple_support//platforms:macos_arm64
 IOS_DEV=@build_bazel_apple_support//platforms:ios_arm64
 IOS_SIM=@build_bazel_apple_support//platforms:ios_sim_arm64
+IOS_SIM_X64=@build_bazel_apple_support//platforms:ios_x86_64
 WATCHOS_ARM64_32_DEV=@build_bazel_apple_support//platforms:watchos_arm64_32
 WATCHOS_ARM64_SIM=@build_bazel_apple_support//platforms:watchos_arm64
 
@@ -45,6 +46,7 @@ build_one() {
 build_one "$MACOS" macos_arm64 macos
 build_one "$IOS_DEV" ios_arm64 ios
 build_one "$IOS_SIM" ios_sim_arm64 ios
+build_one "$IOS_SIM_X64" ios_sim_x64 ios
 # TODO: Uncomment when activating WatchOS
 #build_one "$WATCHOS_ARM64_32_DEV" watchos_arm64_32 watchos
 #build_one "$WATCHOS_ARM64_SIM" watchos_sim_arm64 watchos

grpc/grpc-core/gradle.properties

@@ -4,7 +4,6 @@
 kotlinx.rpc.exclude.wasmWasi=true
 kotlinx.rpc.exclude.js=true
 kotlinx.rpc.exclude.wasmJs=true
-kotlinx.rpc.exclude.iosX64=true
 kotlinx.rpc.exclude.linuxArm64=true
 kotlinx.rpc.exclude.linuxX64=true
 kotlinx.rpc.exclude.macosX64=true

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

@@ -12,6 +12,7 @@ strictEnums = grpc_status_code grpc_connectivity_state grpc_call_error
 staticLibraries.macos_arm64 = libkgrpc_static.macos_arm64.a
 staticLibraries.ios_arm64 = libkgrpc_static.ios_arm64.a
 staticLibraries.ios_simulator_arm64 = libkgrpc_static.ios_sim_arm64.a
+staticLibraries.ios_simulator_x64 = libkgrpc_static.ios_sim_x64.a
 # TODO: Uncomment when activating WatchOS
 # staticLibraries.watchos_arm64 = libkgrpc_static.watchos_arm64_32.a
 # staticLibraries.watchos_simulator_arm64 = libkgrpc_static.watchos_sim_arm64.a

protobuf/protobuf-core/gradle.properties

@@ -4,7 +4,6 @@
 kotlinx.rpc.exclude.wasmWasi=true
 kotlinx.rpc.exclude.js=true
 kotlinx.rpc.exclude.wasmJs=true
-kotlinx.rpc.exclude.iosX64=true
 kotlinx.rpc.exclude.linuxArm64=true
 kotlinx.rpc.exclude.linuxX64=true
 kotlinx.rpc.exclude.macosX64=true

protobuf/protobuf-core/src/nativeInterop/cinterop/libprotowire.def

@@ -7,6 +7,7 @@ noStringConversion = pw_encoder_write_string
 staticLibraries.macos_arm64 = libprotowire_static.macos_arm64.a
 staticLibraries.ios_arm64 = libprotowire_static.ios_arm64.a
 staticLibraries.ios_simulator_arm64 = libprotowire_static.ios_sim_arm64.a
+staticLibraries.ios_simulator_x64 = libprotowire_static.ios_sim_x64.a
 # TODO: Uncomment when activating WatchOS
 # staticLibraries.watchos_arm64 = libprotowire_static.watchos_arm64_32.a
 # staticLibraries.watchos_simulator_arm64 = libprotowire_static.watchos_sim_arm64.a