Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jan 28, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db9d25
build(android): use latest cross to make libraries work again
berendsliedrecht Jan 28, 2025
3abf0ae
Merge branch 'main' into fix-android-build
berendsliedrecht Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 7 additions & 3 deletions include/libaries_askar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);

Expand All @@ -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,
Expand Down Expand Up @@ -627,5 +631,5 @@ void askar_terminate(void);
char *askar_version(void);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
} // extern "C"
#endif // __cplusplus
Loading