From 89a2d93214fb1281e60009d3361ac4ade17756d3 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Wed, 12 May 2021 13:26:29 +0200 Subject: [PATCH 1/4] Android build: Add external .gitignore file --- android/external/.gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 android/external/.gitignore diff --git a/android/external/.gitignore b/android/external/.gitignore new file mode 100644 index 0000000..9949a34 --- /dev/null +++ b/android/external/.gitignore @@ -0,0 +1,8 @@ +arm64-v8a/ +armeabi-v7a/ +x86/ +x86_64/ +*.stamp +*.git +*.tar.bz2 +*.tar.gz From 16ded797b7f9a43db749ab5de12d3e50f8d2463e Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Wed, 12 May 2021 23:40:11 +0200 Subject: [PATCH 2/4] Android build: Remove sequoia build files on make clean-all --- android/external/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/android/external/Makefile b/android/external/Makefile index 5d5049c..b4691a9 100644 --- a/android/external/Makefile +++ b/android/external/Makefile @@ -49,6 +49,7 @@ clean-all: $(MAKE) -C arm64-v8a clean-all $(MAKE) -C x86 clean-all $(MAKE) -C x86_64 clean-all + rm -rf build downloads/downloads.stamp: $(MAKE) -C downloads From 6ec17e8a6229b13ab3cdef8462e9d6951a3d314f Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Wed, 12 May 2021 23:41:02 +0200 Subject: [PATCH 3/4] Android build: update sequoia version to openpgp/v1.1 --- android/external/Makefile.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/external/Makefile.conf b/android/external/Makefile.conf index 7ea084b..5e97085 100644 --- a/android/external/Makefile.conf +++ b/android/external/Makefile.conf @@ -20,7 +20,7 @@ NETTLE_VERSION=3.7 ### Git deps repos EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD -EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?365d00a08bec6a5a48d48a7c7893d78c27092b59 +EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.1.0 ### Common variables #### Source code targets From c2ffa0932f8c0e09cd41f167ba4b2d56d08a5132 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Wed, 12 May 2021 23:43:38 +0200 Subject: [PATCH 4/4] Android build: Update engine version on AndroidHelper.java --- android/src/foundation/pEp/jniadapter/AndroidHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/foundation/pEp/jniadapter/AndroidHelper.java b/android/src/foundation/pEp/jniadapter/AndroidHelper.java index 99c1dac..17e3350 100644 --- a/android/src/foundation/pEp/jniadapter/AndroidHelper.java +++ b/android/src/foundation/pEp/jniadapter/AndroidHelper.java @@ -31,7 +31,7 @@ public class AndroidHelper { // TODO : Increment when needed. // TODO : Check if this version tracking is really needed and Automatize it - public static String ENGINE_VERSION_CODE = "Release_2.1.27"; + public static String ENGINE_VERSION_CODE = "Release_2.1.33"; private static File shareDir;