build(android): use latest cross to make libraries work again (#352)

Signed-off-by: Berend Sliedrecht <[email protected]>
openwallet-foundation · Jan 28, 2025 · 01dcf5b · 01dcf5b
1 parent d399c75
commit 01dcf5b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -394,13 +394,13 @@ jobs:
 
       - name: Build
         run: |
-          # Using a fixed pre-release tag with a fix for NDK 25 support
-          cargo install --git https://github.com/cross-rs/cross.git --rev 085092c cross
-          # Required for compatibility with manylinux2014:
+          cargo install cross --git https://github.com/cross-rs/cross.git
+
           # https://github.com/briansmith/ring/issues/1728
           if [ "${{ matrix.target }}" = "aarch64-linux-android" ]; then
             export CFLAGS="-D__ARM_ARCH=8"
           fi
+
           cross build --lib --release --target ${{matrix.target}} --features ${{ env.FEATURES }}
 
       - name: Upload artifacts

diff --git a/Cross.toml b/Cross.toml
@@ -6,15 +6,3 @@ image = "ghcr.io/rust-cross/manylinux2014-cross:aarch64"
 
 [target.x86_64-unknown-linux-gnu]
 image = "ghcr.io/rust-cross/manylinux2014-cross:x86_64"
-
-[target.x86_64-linux-android]
-#image = "ghcr.io/hyperledger/aries-builder-images/cross/x86_64-linux-android:main"
-
-[target.i686-linux-android]
-#image = "ghcr.io/hyperledger/aries-builder-images/cross/i686-linux-android:main"
-
-[target.aarch64-linux-android]
-#image = "ghcr.io/hyperledger/aries-builder-images/cross/aarch64-linux-android:main"
-
-[target.armv7-linux-androideabi]
-#image = "ghcr.io/hyperledger/aries-builder-images/cross/armv7-linux-androideabi:main"
diff --git a/include/libaries_askar.h b/include/libaries_askar.h
@@ -384,7 +384,7 @@ ErrorCode askar_key_get_public_bytes(LocalKeyHandle handle, struct SecretBuffer
 
 ErrorCode askar_key_get_secret_bytes(LocalKeyHandle handle, struct SecretBuffer *out);
 
-ErrorCode skar_key_get_supported_backends(StringListHandle *out);
+ErrorCode askar_key_get_supported_backends(StringListHandle *out);
 
 ErrorCode askar_key_sign_message(LocalKeyHandle handle,
                                  struct ByteBuffer message,
@@ -440,6 +440,8 @@ ErrorCode askar_scan_start(StoreHandle handle,
                            FfiStr tag_filter,
                            int64_t offset,
                            int64_t limit,
+                           FfiStr order_by,
+                           int8_t descending,
                            void (*cb)(CallbackId cb_id, ErrorCode err, ScanHandle handle),
                            CallbackId cb_id);
 
@@ -465,6 +467,8 @@ ErrorCode askar_session_fetch_all(SessionHandle handle,
                                   FfiStr category,
                                   FfiStr tag_filter,
                                   int64_t limit,
+                                  FfiStr order_by,
+                                  int8_t descending,
                                   int8_t for_update,
                                   void (*cb)(CallbackId cb_id,
                                              ErrorCode err,
@@ -627,5 +631,5 @@ void askar_terminate(void);
 char *askar_version(void);
 
 #ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
+}  // extern "C"
+#endif  // __cplusplus