Skip to content
New issue

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

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

Already on GitHub? # to your account

apk: Include recursive libraries via gradle as well #140

Merged
merged 1 commit into from
Jan 3, 2025

Conversation

MarijnS95
Copy link
Member

The gradle build was only including the target library from cargo, but not any (in)direct dependencies like libc++_shared.so.

Move the logic where we recursively scan all libraries, and pass the result to the gradle builder in addition to the existing apk builder.


Code is a bit nasty so I might want to improve this before we land it, but at least it works.

@MarijnS95 MarijnS95 force-pushed the gradle-library-dependencies branch from df53b08 to 2a13bae Compare October 10, 2023 13:05
@MarijnS95 MarijnS95 marked this pull request as ready for review October 10, 2023 13:05
@MarijnS95
Copy link
Member Author

Went over this again and I'm okay with how it is working.

@MarijnS95 MarijnS95 requested a review from dvc94ch October 10, 2023 13:05
@MarijnS95
Copy link
Member Author

Don't forget to review this with the Hide whitespace setting turned on to make the diff much more digestible.

The `gradle` build was only including the target library from `cargo`,
but not any (in)direct dependencies like `libc++_shared.so`.

Move the logic where we recursively scan all libraries, and pass
the result to the `gradle` builder in addition to the existing `apk`
builder.
@MarijnS95 MarijnS95 force-pushed the gradle-library-dependencies branch from bd2052f to 8c72628 Compare January 3, 2025 22:08
@MarijnS95 MarijnS95 merged commit 5662af2 into master Jan 3, 2025
34 checks passed
@MarijnS95 MarijnS95 deleted the gradle-library-dependencies branch January 3, 2025 22:37
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant