yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

Improve readme (#2504)

Browse source 
to prevent this problem in the future:
https://support.delta.chat/t/building-instruction-on-github-page-arent-working/2081/27

Supersedes #2285, but
1. doesn't require the Readme to be updated the NDK is updated
2. Adapted to the changes to Dockerfile.
This commit is contained in:
Hocuri 2023-03-21 21:00:16 +01:00 • committed by GitHub
parent 4c3441be66
commit 2a23d0826c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -33,6 +33,7 @@ ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/bin
# Install NDK manually. Other SDK parts are installed automatically by gradle. # Install NDK manually. Other SDK parts are installed automatically by gradle.
# #
# If you change the NDK version here, also change it in `flake.nix`.
# NDK version r23c LTS aka 23.2.8568313 # NDK version r23c LTS aka 23.2.8568313
RUN sdkmanager --sdk_root=${ANDROID_SDK_ROOT} 'ndk;23.2.8568313' RUN sdkmanager --sdk_root=${ANDROID_SDK_ROOT} 'ndk;23.2.8568313'

8
README.md
View file

@ -122,12 +122,8 @@ See https://wiki.archlinux.org/index.php/Podman#Rootless_Podman for more informa
To setup build environment manually: To setup build environment manually:
- _Either_, in Android Studio, go to "Tools / SDK Manager / SDK Tools", enable "Show Package Details", - _Either_, in Android Studio, go to "Tools / SDK Manager / SDK Tools", enable "Show Package Details",
select "CMake" and the desired NDK, hit "Apply". select "CMake" and the desired NDK (install the same NDK version as the [Dockerfile](https://github.com/deltachat/deltachat-android/blob/master/Dockerfile)), hit "Apply".
- _Or_ read `Dockerfile` and mimic what it does. - _Or_ read [Dockerfile](https://github.com/deltachat/deltachat-android/blob/master/Dockerfile) and mimic what it does.
Currently ndk20b is the minimum required version.
Newer versions will likely work, however, changes on the ndk-version should be
done with care. Too new versions do not support abi16 and cannot be used to target Android 4.3 or lower.
Then, in both cases, install Rust using [rustup](https://rustup.rs/) Then, in both cases, install Rust using [rustup](https://rustup.rs/)
and Rust toolchains for cross-compilation by executing `scripts/install-toolchains.sh`. and Rust toolchains for cross-compilation by executing `scripts/install-toolchains.sh`.