Update cbindgen config

Change-Id: I8693c810fd024b106fc5d5114a1b43ac1b5f37fb Signed-off-by: kexuan.yang <kexuan.yang@gmail.com>
yangkx-1024 · Jan 29, 2024 · 993e2b5 · 993e2b5
1 parent 8781c32
commit 993e2b5
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 13 deletions.
diff --git a/android/library-encrypt/src/main/jniLibs/arm64-v8a/libmmkv.so b/android/library-encrypt/src/main/jniLibs/arm64-v8a/libmmkv.so
diff --git a/android/library-encrypt/src/main/jniLibs/armeabi-v7a/libmmkv.so b/android/library-encrypt/src/main/jniLibs/armeabi-v7a/libmmkv.so
diff --git a/android/library-encrypt/src/main/jniLibs/x86_64/libmmkv.so b/android/library-encrypt/src/main/jniLibs/x86_64/libmmkv.so
diff --git a/android/library/src/main/jniLibs/arm64-v8a/libmmkv.so b/android/library/src/main/jniLibs/arm64-v8a/libmmkv.so
diff --git a/android/library/src/main/jniLibs/armeabi-v7a/libmmkv.so b/android/library/src/main/jniLibs/armeabi-v7a/libmmkv.so
diff --git a/android/library/src/main/jniLibs/x86_64/libmmkv.so b/android/library/src/main/jniLibs/x86_64/libmmkv.so
diff --git a/build_apple.sh b/build_apple.sh
@@ -15,7 +15,7 @@ done
 HEADER="include"
 mkdir $HEADER
 cargo expand ffi > $HEADER/mod.rs
-cbindgen $HEADER/mod.rs -l C -s tag > src/ffi/rust_mmkv.h
+cbindgen --config cbindgen.toml $HEADER/mod.rs -o src/ffi/rust_mmkv.h
 cp src/ffi/rust_mmkv.h $HEADER/rust_mmkv.h
 rm $HEADER/mod.rs
 touch $HEADER/module.modulemap

diff --git a/cbindgen.toml b/cbindgen.toml
@@ -0,0 +1,5 @@
+language = "C"
+style = "tag"
+
+[export]
+include = ["RawTypedArray"]
diff --git a/ios/MMKV/RustMMKV.xcframework.zip b/ios/MMKV/RustMMKV.xcframework.zip
diff --git a/src/ffi/mod.rs b/src/ffi/mod.rs
@@ -47,11 +47,6 @@ pub struct RawTypedArray {
     pub len: usize,
 }
 
-#[no_mangle]
-pub extern "C" fn __use_typed_array(typed_array: RawTypedArray) {
-    error!(LOG_TAG, "{:?}", typed_array)
-}
-
 #[repr(C)]
 #[derive(Debug)]
 pub struct NativeLogger {

diff --git a/src/ffi/rust_mmkv.h b/src/ffi/rust_mmkv.h
@@ -17,12 +17,6 @@ enum Types {
   F64Array,
 };
 
-struct RawTypedArray {
-  const void *array;
-  enum Types type_token;
-  uintptr_t len;
-};
-
 struct ByteSlice {
   const uint8_t *bytes;
   uintptr_t len;
@@ -57,7 +51,11 @@ typedef const float *CF32Array;
 
 typedef const double *CF64Array;
 
-void __use_typed_array(struct RawTypedArray typed_array);
+struct RawTypedArray {
+  const void *array;
+  enum Types type_token;
+  uintptr_t len;
+};
 
 void initialize(const char *dir);