mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
Build the store engines with cargo-ndk, binaries out of tree
Gradle task buildRustStores runs cargo ndk for arm64-v8a (API 26) into app/build/rustJniLibs, one more jniLibs source, before preBuild; -PskipRust=true leaves the library out for a checkout without a Rust toolchain. cargo-ndk exports the NDK clang/llvm-ar for ring (rustls), the step Bannerlator's CI does by hand. CI adds the Android target and cargo-ndk, caches the cargo registry, cargo-ndk and the crate's target tree keyed on rustc + Cargo.lock, and after the build checks the exports in the apk's libdroiddeckstores.so and that the lockfile did not move (uploading it when it did). tools/build_local.sh gets the same step, DROIDDECK_SKIP_RUST=1 to opt out.
This commit is contained in:
1 parent
401a650b5b
commit
05097b0eea
4 files changed
+124
-1
No files matched your search
+22
-1
@@ -331,8 +331,29 @@ tar -cf - -C "${bundle_dir}" . | zstd -19 -T0 -c > "${staging_dir}/pulseaudio.tz
|
||||
bundle_replaced=1
|
||||
mv "${staging_dir}/pulseaudio.tzst" "${bundle_asset}"
|
||||
|
||||
# The GOG / Epic / Amazon download engines are Rust (app/src/main/rust/stores); Gradle's
|
||||
# buildRustStores task cross-compiles them with cargo-ndk, which needs the Android target and the
|
||||
# cargo-ndk binary installed once. DROIDDECK_SKIP_RUST=1 builds an apk without the engines (the
|
||||
# stores then report themselves unavailable) for a machine without a Rust toolchain.
|
||||
gradle_rust_arg=""
|
||||
if [[ "${DROIDDECK_SKIP_RUST:-0}" == 1 ]]; then
|
||||
gradle_rust_arg="-PskipRust=true"
|
||||
else
|
||||
export PATH="${HOME}/.cargo/bin:${PATH}"
|
||||
for tool in rustup cargo; do
|
||||
if ! command -v "${tool}" >/dev/null 2>&1; then
|
||||
echo "${tool} is required for the store engines (https://rustup.rs); set DROIDDECK_SKIP_RUST=1 to build without them." >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
rustup target add aarch64-linux-android
|
||||
if ! command -v cargo-ndk >/dev/null 2>&1; then
|
||||
cargo install cargo-ndk --locked
|
||||
fi
|
||||
fi
|
||||
|
||||
cd "${repo_root}"
|
||||
./gradlew "${gradle_task}" --console=plain -PndkVersion="${ndk_version}"
|
||||
./gradlew "${gradle_task}" --console=plain -PndkVersion="${ndk_version}" ${gradle_rust_arg}
|
||||
python3 tools/release/check_session_assets.py "app/build/outputs/apk/${build_variant}/app-${build_variant}.apk"
|
||||
cp -p "${bundle_backup}" "${bundle_asset}"
|
||||
bundle_replaced=0
|
||||
|
||||
Reference in new issue
Block a user