mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 09:49:21 +02:00
Move ndk-make.sh to scripts/
Keep symlink for backwards compatibility.
This commit is contained in:
link2xt
parent
6ac1984f7c
commit
2c49febc92
4 changed files with 163 additions and 162 deletions
2
.github/workflows/preview-apk.yml
vendored
2
.github/workflows/preview-apk.yml
vendored
|
|
@ -41,7 +41,7 @@ jobs:
|
||||||
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
|
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
|
||||||
run: |
|
run: |
|
||||||
export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
|
export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
|
||||||
./scripts/install-toolchains.sh && ./ndk-make.sh
|
scripts/install-toolchains.sh && scripts/ndk-make.sh
|
||||||
|
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/wrapper-validation-action@v1
|
uses: gradle/wrapper-validation-action@v1
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ You can leave the container with Ctrl+D or by typing `exit` and re-enter it with
|
||||||
Within the container, install toolchains and build the native library:
|
Within the container, install toolchains and build the native library:
|
||||||
```
|
```
|
||||||
deltachat@6012dcb974fe:/home/app$ scripts/install-toolchains.sh
|
deltachat@6012dcb974fe:/home/app$ scripts/install-toolchains.sh
|
||||||
deltachat@6012dcb974fe:/home/app$ ./ndk-make.sh
|
deltachat@6012dcb974fe:/home/app$ scripts/ndk-make.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
Then, [build an APK](https://developer.android.com/studio/build/building-cmdline):
|
Then, [build an APK](https://developer.android.com/studio/build/building-cmdline):
|
||||||
|
|
@ -118,7 +118,7 @@ done with care.
|
||||||
Then, install Rust using [rustup](https://rustup.rs/). Install Rust
|
Then, install Rust using [rustup](https://rustup.rs/). Install Rust
|
||||||
toolchains for cross-compilation by executing `scripts/install-toolchains.sh`.
|
toolchains for cross-compilation by executing `scripts/install-toolchains.sh`.
|
||||||
|
|
||||||
After that, call `./ndk-make.sh` in the root directory to build core-rust.
|
After that, call `scripts/ndk-make.sh` in the root directory to build core-rust.
|
||||||
Afterwards run the project in Android Studio. The project requires API 25.
|
Afterwards run the project in Android Studio. The project requires API 25.
|
||||||
|
|
||||||
With chance, that's it :) - if not, read on how to set up a proper development
|
With chance, that's it :) - if not, read on how to set up a proper development
|
||||||
|
|
|
||||||
159
ndk-make.sh
159
ndk-make.sh
|
|
@ -1,159 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# If you want to speed up compilation, you can run this script with your
|
|
||||||
# architecture as an argument:
|
|
||||||
#
|
|
||||||
# ./ndk-make.sh arm64-v8a
|
|
||||||
#
|
|
||||||
# Possible values are armeabi-v7a, arm64-v8a, x86 and x86_64.
|
|
||||||
# You should be able to find out your architecture by running:
|
|
||||||
#
|
|
||||||
# adb shell uname -m
|
|
||||||
#
|
|
||||||
# Or you just guess your phone's architecture to be arm64-v8a and if you
|
|
||||||
# guessed wrongly, a warning message will pop up inside the app, telling
|
|
||||||
# you what the correct one is.
|
|
||||||
#
|
|
||||||
# The values in the following lines mean the same:
|
|
||||||
#
|
|
||||||
# armeabi-v7a, armv7 and arm
|
|
||||||
# arm64-v8a, aarch64 and arm64
|
|
||||||
# x86 and i686
|
|
||||||
# (there are no synonyms for x86_64)
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# If you put this in your .bashrc, then you can directly build and
|
|
||||||
# deploy DeltaChat from the jni/deltachat-core-rust directory by
|
|
||||||
# typing `nmake`:
|
|
||||||
#
|
|
||||||
# nmake() {(cd ../..; ./ndk-make.sh arm64-v8a && ./gradlew installFatDebug; notify-send "install finished")}
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# If anything doesn't work, please open an issue!!
|
|
||||||
|
|
||||||
set -e
|
|
||||||
echo "starting time: `date`"
|
|
||||||
|
|
||||||
: "${ANDROID_NDK_ROOT:=$ANDROID_NDK_HOME}"
|
|
||||||
: "${ANDROID_NDK_ROOT:=$ANDROID_NDK}"
|
|
||||||
if test -z "$ANDROID_NDK_ROOT"; then
|
|
||||||
echo "ANDROID_NDK_ROOT is not set"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo Setting CARGO_TARGET environment variables.
|
|
||||||
|
|
||||||
if test -z "$NDK_HOST_TAG"; then
|
|
||||||
KERNEL="$(uname -s | tr '[:upper:]' '[:lower:]')"
|
|
||||||
ARCH="$(uname -m)"
|
|
||||||
NDK_HOST_TAG="$KERNEL-$ARCH"
|
|
||||||
fi
|
|
||||||
|
|
||||||
TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
|
|
||||||
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang"
|
|
||||||
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-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"
|
|
||||||
|
|
||||||
# Check if the argument is a correct architecture:
|
|
||||||
if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then
|
|
||||||
echo "Architecture '$1' not known, possible values are armeabi-v7a, arm64-v8a, x86 and x86_64."
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd jni
|
|
||||||
jnidir=$PWD
|
|
||||||
rm -f armeabi-v7a/*
|
|
||||||
rm -f arm64-v8a/*
|
|
||||||
rm -f x86/*
|
|
||||||
rm -f x86_64/*
|
|
||||||
mkdir -p armeabi-v7a
|
|
||||||
mkdir -p arm64-v8a
|
|
||||||
mkdir -p x86
|
|
||||||
mkdir -p x86_64
|
|
||||||
|
|
||||||
cd deltachat-core-rust
|
|
||||||
|
|
||||||
# fix build on MacOS Catalina
|
|
||||||
unset CPATH
|
|
||||||
|
|
||||||
if test -z $1; then
|
|
||||||
echo Full build
|
|
||||||
|
|
||||||
# According to 1.45.0 changelog in https://github.com/rust-lang/rust/blob/master/RELEASES.md,
|
|
||||||
# "The recommended way to control LTO is with Cargo profiles, either in Cargo.toml or .cargo/config, or by setting CARGO_PROFILE_<name>_LTO in the environment."
|
|
||||||
export CARGO_PROFILE_RELEASE_LTO=on
|
|
||||||
RELEASE="release"
|
|
||||||
RELEASEFLAG="--release"
|
|
||||||
else
|
|
||||||
echo Fast, partial, slow debug build. DO NOT UPLOAD THE APK ANYWHERE.
|
|
||||||
|
|
||||||
RELEASE="debug"
|
|
||||||
RELEASEFLAG=
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Work around the bug in the build of Rust standard library.
|
|
||||||
# It is built against r22b NDK toolchains and still requires -lgcc instead of -lunwind used in newer r23 NDK.
|
|
||||||
# See discussion at <https://github.com/rust-lang/rust/pull/85806>
|
|
||||||
TMPLIB="$(mktemp -d)"
|
|
||||||
if test -z "$(find "$ANDROID_NDK_ROOT" -name libgcc.a -print -quit)"; then
|
|
||||||
# NDK is does not contain libgcc.a, add a linker script to fake it.
|
|
||||||
echo 'INPUT(-lunwind)' >"$TMPLIB/libgcc.a"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z $1 || test $1 = armeabi-v7a; then
|
|
||||||
echo "-- cross compiling to armv7-linux-androideabi (arm) --"
|
|
||||||
export CFLAGS=-D__ANDROID_API__=16
|
|
||||||
TARGET_CC=armv7a-linux-androideabi16-clang \
|
|
||||||
TARGET_AR=llvm-ar \
|
|
||||||
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB"
|
|
||||||
cp target/armv7-linux-androideabi/$RELEASE/libdeltachat.a $jnidir/armeabi-v7a
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z $1 || test $1 = arm64-v8a; then
|
|
||||||
echo "-- cross compiling to aarch64-linux-android (arm64) --"
|
|
||||||
export CFLAGS=-D__ANDROID_API__=21
|
|
||||||
TARGET_CC=aarch64-linux-android21-clang \
|
|
||||||
TARGET_AR=llvm-ar \
|
|
||||||
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
|
|
||||||
cp target/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z $1 || test $1 = x86; then
|
|
||||||
echo "-- cross compiling to i686-linux-android (x86) --"
|
|
||||||
export CFLAGS=-D__ANDROID_API__=16
|
|
||||||
TARGET_CC=i686-linux-android16-clang \
|
|
||||||
TARGET_AR=llvm-ar \
|
|
||||||
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target i686-linux-android -p deltachat_ffi -- -L "$TMPLIB"
|
|
||||||
cp target/i686-linux-android/$RELEASE/libdeltachat.a $jnidir/x86
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z $1 || test $1 = x86_64; then
|
|
||||||
echo "-- cross compiling to x86_64-linux-android (x86_64) --"
|
|
||||||
export CFLAGS=-D__ANDROID_API__=21
|
|
||||||
TARGET_CC=x86_64-linux-android21-clang \
|
|
||||||
TARGET_AR=llvm-ar \
|
|
||||||
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
|
|
||||||
cp target/x86_64-linux-android/$RELEASE/libdeltachat.a $jnidir/x86_64
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -fr "$TMPLIB"
|
|
||||||
|
|
||||||
echo -- ndk-build --
|
|
||||||
|
|
||||||
cd ../..
|
|
||||||
|
|
||||||
if test $1; then
|
|
||||||
"$ANDROID_NDK_ROOT/ndk-build" APP_ABI="$1"
|
|
||||||
else
|
|
||||||
# We are compiling for all architectures defined in Application.mk
|
|
||||||
"$ANDROID_NDK_ROOT/ndk-build"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $1; then
|
|
||||||
echo "NDK_ARCH=$1" >ndkArch
|
|
||||||
else
|
|
||||||
rm -f ndkArch # Remove ndkArch, ignore if it doesn't exist
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "ending time: `date`"
|
|
||||||
1
ndk-make.sh
Symbolic link
1
ndk-make.sh
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
scripts/ndk-make.sh
|
||||||
159
scripts/ndk-make.sh
Executable file
159
scripts/ndk-make.sh
Executable file
|
|
@ -0,0 +1,159 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# If you want to speed up compilation, you can run this script with your
|
||||||
|
# architecture as an argument:
|
||||||
|
#
|
||||||
|
# scripts/ndk-make.sh arm64-v8a
|
||||||
|
#
|
||||||
|
# Possible values are armeabi-v7a, arm64-v8a, x86 and x86_64.
|
||||||
|
# You should be able to find out your architecture by running:
|
||||||
|
#
|
||||||
|
# adb shell uname -m
|
||||||
|
#
|
||||||
|
# Or you just guess your phone's architecture to be arm64-v8a and if you
|
||||||
|
# guessed wrongly, a warning message will pop up inside the app, telling
|
||||||
|
# you what the correct one is.
|
||||||
|
#
|
||||||
|
# The values in the following lines mean the same:
|
||||||
|
#
|
||||||
|
# armeabi-v7a, armv7 and arm
|
||||||
|
# arm64-v8a, aarch64 and arm64
|
||||||
|
# x86 and i686
|
||||||
|
# (there are no synonyms for x86_64)
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# If you put this in your .bashrc, then you can directly build and
|
||||||
|
# deploy DeltaChat from the jni/deltachat-core-rust directory by
|
||||||
|
# typing `nmake`:
|
||||||
|
#
|
||||||
|
# nmake() {(cd ../..; scripts/ndk-make.sh arm64-v8a && ./gradlew installFatDebug; notify-send "install finished")}
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# If anything doesn't work, please open an issue!!
|
||||||
|
|
||||||
|
set -e
|
||||||
|
echo "starting time: `date`"
|
||||||
|
|
||||||
|
: "${ANDROID_NDK_ROOT:=$ANDROID_NDK_HOME}"
|
||||||
|
: "${ANDROID_NDK_ROOT:=$ANDROID_NDK}"
|
||||||
|
if test -z "$ANDROID_NDK_ROOT"; then
|
||||||
|
echo "ANDROID_NDK_ROOT is not set"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo Setting CARGO_TARGET environment variables.
|
||||||
|
|
||||||
|
if test -z "$NDK_HOST_TAG"; then
|
||||||
|
KERNEL="$(uname -s | tr '[:upper:]' '[:lower:]')"
|
||||||
|
ARCH="$(uname -m)"
|
||||||
|
NDK_HOST_TAG="$KERNEL-$ARCH"
|
||||||
|
fi
|
||||||
|
|
||||||
|
TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
|
||||||
|
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang"
|
||||||
|
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-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"
|
||||||
|
|
||||||
|
# Check if the argument is a correct architecture:
|
||||||
|
if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then
|
||||||
|
echo "Architecture '$1' not known, possible values are armeabi-v7a, arm64-v8a, x86 and x86_64."
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd jni
|
||||||
|
jnidir=$PWD
|
||||||
|
rm -f armeabi-v7a/*
|
||||||
|
rm -f arm64-v8a/*
|
||||||
|
rm -f x86/*
|
||||||
|
rm -f x86_64/*
|
||||||
|
mkdir -p armeabi-v7a
|
||||||
|
mkdir -p arm64-v8a
|
||||||
|
mkdir -p x86
|
||||||
|
mkdir -p x86_64
|
||||||
|
|
||||||
|
cd deltachat-core-rust
|
||||||
|
|
||||||
|
# fix build on MacOS Catalina
|
||||||
|
unset CPATH
|
||||||
|
|
||||||
|
if test -z $1; then
|
||||||
|
echo Full build
|
||||||
|
|
||||||
|
# According to 1.45.0 changelog in https://github.com/rust-lang/rust/blob/master/RELEASES.md,
|
||||||
|
# "The recommended way to control LTO is with Cargo profiles, either in Cargo.toml or .cargo/config, or by setting CARGO_PROFILE_<name>_LTO in the environment."
|
||||||
|
export CARGO_PROFILE_RELEASE_LTO=on
|
||||||
|
RELEASE="release"
|
||||||
|
RELEASEFLAG="--release"
|
||||||
|
else
|
||||||
|
echo Fast, partial, slow debug build. DO NOT UPLOAD THE APK ANYWHERE.
|
||||||
|
|
||||||
|
RELEASE="debug"
|
||||||
|
RELEASEFLAG=
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Work around the bug in the build of Rust standard library.
|
||||||
|
# It is built against r22b NDK toolchains and still requires -lgcc instead of -lunwind used in newer r23 NDK.
|
||||||
|
# See discussion at <https://github.com/rust-lang/rust/pull/85806>
|
||||||
|
TMPLIB="$(mktemp -d)"
|
||||||
|
if test -z "$(find "$ANDROID_NDK_ROOT" -name libgcc.a -print -quit)"; then
|
||||||
|
# NDK is does not contain libgcc.a, add a linker script to fake it.
|
||||||
|
echo 'INPUT(-lunwind)' >"$TMPLIB/libgcc.a"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -z $1 || test $1 = armeabi-v7a; then
|
||||||
|
echo "-- cross compiling to armv7-linux-androideabi (arm) --"
|
||||||
|
export CFLAGS=-D__ANDROID_API__=16
|
||||||
|
TARGET_CC=armv7a-linux-androideabi16-clang \
|
||||||
|
TARGET_AR=llvm-ar \
|
||||||
|
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB"
|
||||||
|
cp target/armv7-linux-androideabi/$RELEASE/libdeltachat.a $jnidir/armeabi-v7a
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -z $1 || test $1 = arm64-v8a; then
|
||||||
|
echo "-- cross compiling to aarch64-linux-android (arm64) --"
|
||||||
|
export CFLAGS=-D__ANDROID_API__=21
|
||||||
|
TARGET_CC=aarch64-linux-android21-clang \
|
||||||
|
TARGET_AR=llvm-ar \
|
||||||
|
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
|
||||||
|
cp target/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -z $1 || test $1 = x86; then
|
||||||
|
echo "-- cross compiling to i686-linux-android (x86) --"
|
||||||
|
export CFLAGS=-D__ANDROID_API__=16
|
||||||
|
TARGET_CC=i686-linux-android16-clang \
|
||||||
|
TARGET_AR=llvm-ar \
|
||||||
|
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target i686-linux-android -p deltachat_ffi -- -L "$TMPLIB"
|
||||||
|
cp target/i686-linux-android/$RELEASE/libdeltachat.a $jnidir/x86
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -z $1 || test $1 = x86_64; then
|
||||||
|
echo "-- cross compiling to x86_64-linux-android (x86_64) --"
|
||||||
|
export CFLAGS=-D__ANDROID_API__=21
|
||||||
|
TARGET_CC=x86_64-linux-android21-clang \
|
||||||
|
TARGET_AR=llvm-ar \
|
||||||
|
cargo +`cat rust-toolchain` rustc $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
|
||||||
|
cp target/x86_64-linux-android/$RELEASE/libdeltachat.a $jnidir/x86_64
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -fr "$TMPLIB"
|
||||||
|
|
||||||
|
echo -- ndk-build --
|
||||||
|
|
||||||
|
cd ../..
|
||||||
|
|
||||||
|
if test $1; then
|
||||||
|
"$ANDROID_NDK_ROOT/ndk-build" APP_ABI="$1"
|
||||||
|
else
|
||||||
|
# We are compiling for all architectures defined in Application.mk
|
||||||
|
"$ANDROID_NDK_ROOT/ndk-build"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test $1; then
|
||||||
|
echo "NDK_ARCH=$1" >ndkArch
|
||||||
|
else
|
||||||
|
rm -f ndkArch # Remove ndkArch, ignore if it doesn't exist
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "ending time: `date`"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue