Merge in JNI-120 (Android Build: Update sequoia version to match engine 2.1.2)

android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
     }
 }
 
@@ -32,8 +32,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 2
-        versionName "2.1.0-RC5"
+        versionCode 3
+        versionName "2.1.4"
 
         externalNativeBuild {
             ndkBuild {
@@ -94,7 +94,7 @@ android {
     // call source generation makefile target
     task genSources(type:Exec, dependsOn: 'genpEpEngineAsn1Sources') {
         workingDir '../src'
-        commandLine 'make', "-j${threadsToUse}", 'pEp.jar'
+        commandLine 'make', 'pEp.jar'
     }
 
     task genpEpEngineSyncSources(type:Exec) {

android/external/Makefile.conf

@@ -14,13 +14,13 @@ else
 endif
 
 ### Sequoia deps versions
-OPENSSL_VERSION=1.1.1b
-GMP_VERSION=6.1.2
-NETTLE_VERSION=3.4.1
+OPENSSL_VERSION=1.1.1h
+GMP_VERSION=6.2.0
+NETTLE_VERSION=3.6
 
 ### 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?de497f59570437d448b293769eb57bf7a9741f30
+EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?365d00a08bec6a5a48d48a7c7893d78c27092b59
 
 ### Common variables
 #### Source code targets

android/external/arm64-v8a/Makefile

@@ -222,7 +222,7 @@ $(LOCAL)/lib/libssl.so: openssl/libssl.so
 		cp libcrypto.so $(LOCAL)/lib && \
 		cp libcrypto.a $(LOCAL)/lib && \
 		cp libssl.so $(LOCAL)/lib && \
-		cp libssl.a $(LOCAL)/lib 
+		cp libssl.a $(LOCAL)/lib
 	ls -l $(LOCAL)/lib/libssl.so
 
 openssl-build: openssl/libssl.so
@@ -328,8 +328,7 @@ $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.so:  se
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target aarch64-linux-android -p sequoia-openpgp-ffi --release
-
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target aarch64-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.so
 	cp $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.* $(LOCAL)/lib/

android/external/armeabi-v7a/Makefile

@@ -194,9 +194,6 @@ uuid/jni/Android.mk: uuid.src.stamp
 
 #------------------------------------------------------------------------------#
 # Sequoia
-OPENSSL_VERSION=1.1.1b
-GMP_VERSION=6.1.2
-NETTLE_VERSION=3.4.1
 
 sequoia-deps-build: openssl-install nettle-install
 
@@ -330,7 +327,7 @@ $(CARGO_TARGET_DIR)/armv7-linux-androideabi/release/libsequoia_openpgp_ffi.so:
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target armv7-linux-androideabi -p sequoia-openpgp-ffi --release
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target armv7-linux-androideabi -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
 
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/armv7-linux-androideabi/release/libsequoia_openpgp_ffi.so

android/external/downloads/gmp-6.1.2.tar.bz2.md5

@@ -1 +0,0 @@
-8ddbb26dc3bd4e2302984debba1406a5  gmp-6.1.2.tar.bz2

android/external/downloads/gmp-6.2.0.tar.bz2.md5

@@ -0,0 +1 @@
+c24161e0dd44cae78cd5f67193492a21  gmp-6.2.0.tar.bz2

android/external/downloads/nettle-3.4.1.tar.gz.md5

@@ -1 +0,0 @@
-9bdebb0e2f638d3b9d91f7fc264b70c1  nettle-3.4.1.tar.gz

android/external/downloads/nettle-3.6.tar.gz.md5

@@ -0,0 +1 @@
+c45ee24ed7361dcda152a035d396fe8a  nettle-3.6.tar.gz

android/external/downloads/openssl-1.1.1b.tar.gz.md5

@@ -1 +0,0 @@
-4532712e7bcc9414f5bce995e4e13930  openssl-1.1.1b.tar.gz

android/external/downloads/openssl-1.1.1h.tar.gz.md5

@@ -0,0 +1 @@
+53840c70434793127a3574433494e8d3  openssl-1.1.1h.tar.gz

android/external/x86/Makefile

@@ -327,7 +327,7 @@ $(CARGO_TARGET_DIR)/i686-linux-android/release/libsequoia_openpgp_ffi.so:  sequo
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target i686-linux-android -p sequoia-openpgp-ffi --release
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target i686-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
 
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/i686-linux-android/release/libsequoia_openpgp_ffi.so

android/external/x86_64/Makefile

@@ -327,7 +327,7 @@ $(CARGO_TARGET_DIR)/x86_64-linux-android/release/libsequoia_openpgp_ffi.so:  seq
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target x86_64-linux-android -p sequoia-openpgp-ffi --release
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target x86_64-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
 
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/x86_64-linux-android/release/libsequoia_openpgp_ffi.so

android/src/foundation/pEp/jniadapter/AndroidHelper.java

@@ -28,7 +28,7 @@ public class AndroidHelper {
     private static File tmpDir;
         
     // TODO : Increment when needed.
-    public static int ENGINE_VERSION_CODE = 4768;
+    public static int ENGINE_VERSION_CODE = 5115;
 
     private static File shareDir;