enable arm64-v8a again

This commit is contained in:
adbenitez
2024-02-10 00:36:33 -05:00
parent f599cda957
commit 47b2f4d259
3 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -132,7 +132,7 @@ android {
buildConfigField("String", "TEST_MAIL_PW", buildConfigProperty("TEST_MAIL_PW"))
buildConfigField("String", "NDK_ARCH", getNdkArch())
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "armeabi-v7a", "arm64-v8a", "x86"
}
}
@@ -195,7 +195,7 @@ android {
abi {
enable true
reset()
include "armeabi-v7a", "x86"
include "armeabi-v7a", "arm64-v8a", "x86"
universalApk true
}
}
+1 -1
View File
@@ -1,5 +1,5 @@
APP_PLATFORM := android-16
APP_ABI := armeabi-v7a x86
APP_ABI := armeabi-v7a arm64-v8a x86
APP_STL := none
ifneq ($(NDK_DEBUG),1)
+8 -8
View File
@@ -123,14 +123,14 @@ if test -z $1 || test $1 = armeabi-v7a; then
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) --"
# TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
# TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
# TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
# cargo build $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi --features jsonrpc
# cp target/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
# fi
if test -z $1 || test $1 = arm64-v8a; then
echo "-- cross compiling to aarch64-linux-android (arm64) --"
TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
cargo build $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi --features jsonrpc
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) --"