From 901d8c6f83ae9b65ee9328c9ad46e2a2e84a9869 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 20 Sep 2020 14:59:59 -0400 Subject: [PATCH 1/6] make compatible with deltalab id --- build.gradle | 1 + jni/deltachat-core-rust | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) mode change 160000 => 120000 jni/deltachat-core-rust diff --git a/build.gradle b/build.gradle index 807a4fc01..b2682232d 100644 --- a/build.gradle +++ b/build.gradle @@ -154,6 +154,7 @@ android { applicationIdSuffix ".beta" } release { + applicationIdSuffix ".lite" // minification and proguard disabled for now. // // when enabled, it can cut down apk size about 6%, diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust deleted file mode 160000 index 92abae0b5..000000000 --- a/jni/deltachat-core-rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92abae0b5b35ceb01aec35c70b7ce8587b4d74a0 diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust new file mode 120000 index 000000000..05e3b90cb --- /dev/null +++ b/jni/deltachat-core-rust @@ -0,0 +1 @@ +/home/adb/projects/deltalab-core \ No newline at end of file From 702ad64d0b05c3a158f4f5e7c771c250828d8731 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 20 Sep 2020 15:17:20 -0400 Subject: [PATCH 2/6] don't compile for all arch --- build.gradle | 2 +- jni/Application.mk | 2 +- ndk-make.sh | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index b2682232d..5a0508d5a 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ android { buildConfigField "String", "MAP_ACCESS_TOKEN", '"pk.eyJ1IjoiZGVsdGFjaGF0IiwiYSI6ImNqc3c1aWczMzBjejY0M28wZmU0a3cwMzMifQ.ZPTH9dFJaav06RAu4rTYHw"' ndk { - abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" + abiFilters "armeabi-v7a", "arm64-v8a" //, "x86", "x86_64" } } diff --git a/jni/Application.mk b/jni/Application.mk index a9694f97d..074ad3572 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,3 +1,3 @@ APP_PLATFORM := android-16 -APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 +APP_ABI := armeabi-v7a arm64-v8a # x86 x86_64 APP_STL := c++_static diff --git a/ndk-make.sh b/ndk-make.sh index 7042e77cd..90e9a76fe 100755 --- a/ndk-make.sh +++ b/ndk-make.sh @@ -42,17 +42,17 @@ RUSTFLAGS="-C lto=on -C embed-bitcode=yes" \ TARGET_CC=aarch64-linux-android21-clang \ cargo +`cat rust-toolchain` build --release --target aarch64-linux-android -p deltachat_ffi -echo "-- cross compiling to i686-linux-android (x86) --" -export CFLAGS=-D__ANDROID_API__=16 -RUSTFLAGS="-C lto=on -C embed-bitcode=yes" \ -TARGET_CC=i686-linux-android16-clang \ -cargo +`cat rust-toolchain` build --release --target i686-linux-android -p deltachat_ffi +# echo "-- cross compiling to i686-linux-android (x86) --" +# export CFLAGS=-D__ANDROID_API__=16 +# RUSTFLAGS="-C lto=on -C embed-bitcode=yes" \ +# TARGET_CC=i686-linux-android16-clang \ +# cargo +`cat rust-toolchain` build --release --target i686-linux-android -p deltachat_ffi -echo "-- cross compiling to x86_64-linux-android (x86_64) --" -export CFLAGS=-D__ANDROID_API__=21 -RUSTFLAGS="-C lto=on -C embed-bitcode=yes" \ -TARGET_CC=x86_64-linux-android21-clang \ -cargo +`cat rust-toolchain` build --release --target x86_64-linux-android -p deltachat_ffi +# echo "-- cross compiling to x86_64-linux-android (x86_64) --" +# export CFLAGS=-D__ANDROID_API__=21 +# RUSTFLAGS="-C lto=on -C embed-bitcode=yes" \ +# TARGET_CC=x86_64-linux-android21-clang \ +# cargo +`cat rust-toolchain` build --release --target x86_64-linux-android -p deltachat_ffi echo -- copy generated .a files -- cd .. @@ -66,8 +66,8 @@ mkdir -p x86 mkdir -p x86_64 cp deltachat-core-rust/target/armv7-linux-androideabi/release/libdeltachat.a armeabi-v7a cp deltachat-core-rust/target/aarch64-linux-android/release/libdeltachat.a arm64-v8a -cp deltachat-core-rust/target/i686-linux-android/release/libdeltachat.a x86 -cp deltachat-core-rust/target/x86_64-linux-android/release/libdeltachat.a x86_64 +# cp deltachat-core-rust/target/i686-linux-android/release/libdeltachat.a x86 +# cp deltachat-core-rust/target/x86_64-linux-android/release/libdeltachat.a x86_64 echo -- ndk-build -- cd .. From c477090460d6b675de7b8f16d7f5f13e155df7b0 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 30 Sep 2020 22:27:21 -0400 Subject: [PATCH 3/6] set app identity --- build.gradle | 4 ++-- res/values-es/strings.xml | 2 +- res/values/strings.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 14f3cade4..6966c010a 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ android { vectorDrawables.useSupportLibrary = true // base name of the generated apk - project.ext.set("archivesBaseName", "deltachat"); + project.ext.set("archivesBaseName", "deltachat-lite"); buildConfigField "boolean", "DEV_BUILD", "false" buildConfigField "String", "MAP_ACCESS_TOKEN", '"pk.eyJ1IjoiZGVsdGFjaGF0IiwiYSI6ImNqc3c1aWczMzBjejY0M28wZmU0a3cwMzMifQ.ZPTH9dFJaav06RAu4rTYHw"' @@ -154,7 +154,7 @@ android { applicationIdSuffix ".beta" } release { - applicationIdSuffix ".lite" + applicationIdSuffix ".lite2" // minification and proguard disabled for now. // // when enabled, it can cut down apk size about 6%, diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 4169c9d3b..3fa885ea9 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1,7 +1,7 @@ - Delta Chat + DeltaChat Lite OK Cancelar Sí diff --git a/res/values/strings.xml b/res/values/strings.xml index 9245d3eba..fbbbc5b59 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,7 +1,7 @@ - Delta Chat + DeltaChat Lite OK Cancel Yes From 0f5d5ad23c108027bc6ff6c62843eb7d68e5b22b Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 26 Oct 2020 13:40:57 -0400 Subject: [PATCH 4/6] remove link --- jni/deltachat-core-rust | 1 - 1 file changed, 1 deletion(-) delete mode 120000 jni/deltachat-core-rust diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust deleted file mode 120000 index 05e3b90cb..000000000 --- a/jni/deltachat-core-rust +++ /dev/null @@ -1 +0,0 @@ -/home/adb/projects/deltalab-core \ No newline at end of file From 82c4ad9689b62c240766e230e011c70cb921c4d0 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 14 Nov 2020 16:36:32 -0500 Subject: [PATCH 5/6] update jni/deltachat-core-rust --- jni/deltachat-core-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index ee7bac3b1..ddf4d2741 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit ee7bac3b155a4925e317ff90564998053b8120d6 +Subproject commit ddf4d27417214b262dcd7aca6caa948193b7956c From 28ac48b23cf2ddcea30e09684c3e01193faeb299 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 14 Nov 2020 16:36:59 -0500 Subject: [PATCH 6/6] update ndk-make.sh --- ndk-make.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/ndk-make.sh b/ndk-make.sh index e7078c8ac..09407f545 100755 --- a/ndk-make.sh +++ b/ndk-make.sh @@ -70,18 +70,9 @@ cd deltachat-core-rust # fix build on MacOS Catalina unset CPATH -if test -z $1; then - echo Full build - - export RUSTFLAGS="-C lto=on -C embed-bitcode=yes" - RELEASE="release" - RELEASEFLAG="--release" -else - echo Fast, partial, slow debug build. DO NOT UPLOAD THE APK ANYWHERE. - - RELEASE="debug" - RELEASEFLAG= -fi +export RUSTFLAGS="-C lto=on -C embed-bitcode=yes" +RELEASE="release" +RELEASEFLAG="--release" if test -z $1 || test $1 = armeabi-v7a; then echo "-- cross compiling to armv7-linux-androideabi (arm) --"