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

Remove ndk-make.sh symlink to scripts/ndk-make.sh

Browse source 
If scripts are always called directly without symlink,
there is no need to use `realpath` which is not available
on some systems.

F-Droid builds already use scripts/ndk-make.sh:
<https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/com.b44t.messenger.yml>

Same for nightly builds running on Concourse CI.
This commit is contained in:
link2xt 2023-01-05 18:35:42 +00:00
parent a08335ec38
commit 543a7965c2
5 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/release-checklist.md
View file

@ -7,7 +7,7 @@ on the command-line:
depending on how much you trust in rust, you might want to do a depending on how much you trust in rust, you might want to do a
./scripts/clean-core.sh before building ./scripts/clean-core.sh before building
2. $ ./ndk-make.sh 2. $ ./scripts/ndk-make.sh
this will take some time - meanwhile we're doing some housekeeping: this will take some time - meanwhile we're doing some housekeeping:
@ -35,7 +35,7 @@ in Android Studio:
documentation. documentation.
Add `metadata/en-US/changelogs/4564.txt` file with a changelog for F-Droid. Add `metadata/en-US/changelogs/4564.txt` file with a changelog for F-Droid.
7. if `./ndk-make.sh` from step 2. is finished successfully: 7. if `./scripts/ndk-make.sh` from step 2. is finished successfully:
a) select "Build / Generate Signed Bundle or APK" and then "APK" a) select "Build / Generate Signed Bundle or APK" and then "APK"
(not: App Bundle as this would require uploading the signing key) (not: App Bundle as this would require uploading the signing key)
b) select flavor `gplayRelease` with V1 signature enabled b) select flavor `gplayRelease` with V1 signature enabled

1
ndk-make.sh
View file

@ -1 +0,0 @@
scripts/ndk-make.sh

2
scripts/install-toolchains.sh
View file

@ -4,6 +4,6 @@
# #
set -e set -e
TARGETS="armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android" TARGETS="armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android"
RUSTUP_TOOLCHAIN=$(cat "$(dirname $(realpath "$0"))/rust-toolchain") RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain")
rustup install "$RUSTUP_TOOLCHAIN" rustup install "$RUSTUP_TOOLCHAIN"
rustup target add $TARGETS --toolchain "$RUSTUP_TOOLCHAIN" rustup target add $TARGETS --toolchain "$RUSTUP_TOOLCHAIN"

2
scripts/ndk-make.sh
View file

@ -62,7 +62,7 @@ export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-a
export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang" export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang"
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang" export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang"
RUSTUP_TOOLCHAIN=$(cat "$(dirname $(realpath "$0"))/rust-toolchain") RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain")
# Check if the argument is a correct architecture: # Check if the argument is a correct architecture:
if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then

2
src/org/thoughtcrime/securesms/ConversationListActivity.java
View file

@ -131,7 +131,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
} }
/** /**
* If the build script is invoked with a specific architecture (e.g.`./ndk-make.sh arm64-v8a`), it * If the build script is invoked with a specific architecture (e.g.`ndk-make.sh arm64-v8a`), it
* will compile the core only for this arch. This method checks if the arch was correct. * will compile the core only for this arch. This method checks if the arch was correct.
* *
* In order to do this, `ndk-make.sh` writes its argument into the file `ndkArch`. * In order to do this, `ndk-make.sh` writes its argument into the file `ndkArch`.