Move android binaries

- Ignore EINTR in some places - Update changelog
enwi · Oct 20, 2022 · 9a094e1 · 9a094e1
1 parent 9e9ed75
commit 9a094e1
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### Update binaries
 - Update android binaries to NDK r25
 - Include android x86_64 binaries
+- Move android binaries to `native/jni`
+- Ignore `EINTR` in some places
 
 
 ## 1.0.0-dev.10

diff --git a/android/build.gradle b/android/build.gradle
@@ -50,7 +50,7 @@ android {
 
     sourceSets {
         main {
-            jniLibs.srcDir "../native"
+            jniLibs.srcDir "../native/jni"
         }
     }
 

diff --git a/lib/src/socket.dart b/lib/src/socket.dart
@@ -93,7 +93,7 @@ class ZSocket {
     final result =
         _bindings.zmq_send(_socket, ptr.cast(), data.length, sendParams);
     malloc.free(ptr);
-    _checkReturnCode(result);
+    _checkReturnCode(result, ignore: [EINTR]);
   }
 
   /// Sends the given [string] over this socket
@@ -134,7 +134,7 @@ class ZSocket {
     final endpointPointer = address.toNativeUtf8();
     final result = _bindings.zmq_bind(_socket, endpointPointer);
     malloc.free(endpointPointer);
-    _checkReturnCode(result);
+    _checkReturnCode(result, ignore: [EINTR]);
   }
 
   /// Connects the socket to an endpoint and then accepts incoming connections on that endpoint.
@@ -147,7 +147,7 @@ class ZSocket {
     final endpointPointer = address.toNativeUtf8();
     final result = _bindings.zmq_connect(_socket, endpointPointer);
     malloc.free(endpointPointer);
-    _checkReturnCode(result);
+    _checkReturnCode(result, ignore: [EINTR]);
   }
 
   /// Closes the socket and releases underlying resources.
@@ -167,7 +167,7 @@ class ZSocket {
     final result = _bindings.zmq_setsockopt(
         _socket, option, ptr.cast<Uint8>(), ptr.length);
     malloc.free(ptr);
-    _checkReturnCode(result);
+    _checkReturnCode(result, ignore: [EINTR]);
   }
 
   /// Sets the socket's long term secret key.

diff --git a/lib/src/zeromq.dart b/lib/src/zeromq.dart
@@ -2,6 +2,7 @@ library dartzmq;
 
 import 'dart:async';
 import 'dart:collection';
+import 'dart:developer';
 import 'dart:ffi';
 import 'dart:typed_data';
 
@@ -103,7 +104,7 @@ class ZContext {
           }
         }
 
-        _checkReturnCode(rc, ignore: [EAGAIN]);
+        _checkReturnCode(rc, ignore: [EAGAIN, EINTR]);
       }
 
       rc = _bindings.zmq_msg_close(frame); // rc == 0

diff --git a/native/arm64-v8a/libc++_shared.so → native/jni/arm64-v8a/libc++_shared.so b/native/arm64-v8a/libc++_shared.so → native/jni/arm64-v8a/libc++_shared.so
diff --git a/native/arm64-v8a/libsodium.so → native/jni/arm64-v8a/libsodium.so b/native/arm64-v8a/libsodium.so → native/jni/arm64-v8a/libsodium.so
diff --git a/native/arm64-v8a/libzmq.so → native/jni/arm64-v8a/libzmq.so b/native/arm64-v8a/libzmq.so → native/jni/arm64-v8a/libzmq.so
diff --git a/native/armeabi-v7a/libc++_shared.so → native/jni/armeabi-v7a/libc++_shared.so b/native/armeabi-v7a/libc++_shared.so → native/jni/armeabi-v7a/libc++_shared.so
diff --git a/native/armeabi-v7a/libsodium.so → native/jni/armeabi-v7a/libsodium.so b/native/armeabi-v7a/libsodium.so → native/jni/armeabi-v7a/libsodium.so
diff --git a/native/armeabi-v7a/libzmq.so → native/jni/armeabi-v7a/libzmq.so b/native/armeabi-v7a/libzmq.so → native/jni/armeabi-v7a/libzmq.so
diff --git a/native/x86/libc++_shared.so → native/jni/x86/libc++_shared.so b/native/x86/libc++_shared.so → native/jni/x86/libc++_shared.so
diff --git a/native/x86/libsodium.so → native/jni/x86/libsodium.so b/native/x86/libsodium.so → native/jni/x86/libsodium.so
diff --git a/native/x86/libzmq.so → native/jni/x86/libzmq.so b/native/x86/libzmq.so → native/jni/x86/libzmq.so
diff --git a/native/x86_64/libc++_shared.so → native/jni/x86_64/libc++_shared.so b/native/x86_64/libc++_shared.so → native/jni/x86_64/libc++_shared.so
diff --git a/native/x86_64/libsodium.so → native/jni/x86_64/libsodium.so b/native/x86_64/libsodium.so → native/jni/x86_64/libsodium.so
diff --git a/native/x86_64/libzmq.so → native/jni/x86_64/libzmq.so b/native/x86_64/libzmq.so → native/jni/x86_64/libzmq.so
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ android { @@
         sourceSets {
             main {
-                jniLibs.srcDir "../native"
+                jniLibs.srcDir "../native/jni"
             }
         }
@@ Expand Down @@