protobuf-native: Add support for iOS/arm64

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

Author: Jozott00

cinterop-c/.bazelrc

@@ -1,4 +1,4 @@
 # we build the cc_static library bundled with all dependencies
-build --experimental_cc_static_library
+build --experimental_cc_static_library  --experimental_platform_in_output_dir
 
 build:release --compilation_mode=opt --strip=always

cinterop-c/.gitignore

@@ -12,3 +12,5 @@
 /.aswb/
 /.clwb/
 .idea/
+
+out/

protobuf/protobuf-core/build.gradle.kts

@@ -61,6 +61,7 @@ kotlin {
             )
             extraOpts(
                 "-libraryPath", "${cinteropCLib.resolve("bazel-out/darwin_arm64-opt/bin")}",
+                "-libraryPath", "${cinteropCLib.resolve("out")}",
             )
         }
     }

protobuf/protobuf-core/gradle.properties

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

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

@@ -3,4 +3,7 @@ headerFilter = protowire.h
 
 noStringConversion = pw_encoder_write_string
 
-staticLibraries = libprotowire_static.a
+
+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