Merge in JNI-120 (Android Build: Update sequoia version to match engine 2.1.2) Release_2.1.0 Release_2.1.4
authorheck <heck@pep.foundation>
Mon, 19 Oct 2020 16:46:06 +0200
branchRelease_2.1.0
changeset 970677676fc1fff
parent 964 4a272644d3a3
parent 969 cf852692f4eb
child 971 837aa37384d9
Merge in JNI-120 (Android Build: Update sequoia version to match engine 2.1.2)
     1.1 --- a/android/build.gradle	Fri Oct 09 17:35:08 2020 +0200
     1.2 +++ b/android/build.gradle	Mon Oct 19 16:46:06 2020 +0200
     1.3 @@ -13,7 +13,7 @@
     1.4          jcenter()
     1.5      }
     1.6      dependencies {
     1.7 -        classpath 'com.android.tools.build:gradle:4.0.0'
     1.8 +        classpath 'com.android.tools.build:gradle:4.0.2'
     1.9      }
    1.10  }
    1.11  
    1.12 @@ -32,8 +32,8 @@
    1.13      defaultConfig {
    1.14          minSdkVersion 19
    1.15          targetSdkVersion 30
    1.16 -        versionCode 2
    1.17 -        versionName "2.1.0-RC5"
    1.18 +        versionCode 3
    1.19 +        versionName "2.1.4"
    1.20  
    1.21          externalNativeBuild {
    1.22              ndkBuild {
    1.23 @@ -94,7 +94,7 @@
    1.24      // call source generation makefile target
    1.25      task genSources(type:Exec, dependsOn: 'genpEpEngineAsn1Sources') {
    1.26          workingDir '../src'
    1.27 -        commandLine 'make', "-j${threadsToUse}", 'pEp.jar'
    1.28 +        commandLine 'make', 'pEp.jar'
    1.29      }
    1.30  
    1.31      task genpEpEngineSyncSources(type:Exec) {
     2.1 --- a/android/external/Makefile.conf	Fri Oct 09 17:35:08 2020 +0200
     2.2 +++ b/android/external/Makefile.conf	Mon Oct 19 16:46:06 2020 +0200
     2.3 @@ -14,13 +14,13 @@
     2.4  endif
     2.5  
     2.6  ### Sequoia deps versions
     2.7 -OPENSSL_VERSION=1.1.1b
     2.8 -GMP_VERSION=6.1.2
     2.9 -NETTLE_VERSION=3.4.1
    2.10 +OPENSSL_VERSION=1.1.1h
    2.11 +GMP_VERSION=6.2.0
    2.12 +NETTLE_VERSION=3.6
    2.13  
    2.14  ### Git deps repos
    2.15  EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD
    2.16 -EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?de497f59570437d448b293769eb57bf7a9741f30
    2.17 +EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?365d00a08bec6a5a48d48a7c7893d78c27092b59
    2.18  
    2.19  ### Common variables
    2.20  #### Source code targets
     3.1 --- a/android/external/arm64-v8a/Makefile	Fri Oct 09 17:35:08 2020 +0200
     3.2 +++ b/android/external/arm64-v8a/Makefile	Mon Oct 19 16:46:06 2020 +0200
     3.3 @@ -222,7 +222,7 @@
     3.4  		cp libcrypto.so $(LOCAL)/lib && \
     3.5  		cp libcrypto.a $(LOCAL)/lib && \
     3.6  		cp libssl.so $(LOCAL)/lib && \
     3.7 -		cp libssl.a $(LOCAL)/lib 
     3.8 +		cp libssl.a $(LOCAL)/lib
     3.9  	ls -l $(LOCAL)/lib/libssl.so
    3.10  
    3.11  openssl-build: openssl/libssl.so
    3.12 @@ -328,8 +328,7 @@
    3.13  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
    3.14  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
    3.15  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
    3.16 -	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target aarch64-linux-android -p sequoia-openpgp-ffi --release
    3.17 -
    3.18 +	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
    3.19  
    3.20  $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.so
    3.21  	cp $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.* $(LOCAL)/lib/
     4.1 --- a/android/external/armeabi-v7a/Makefile	Fri Oct 09 17:35:08 2020 +0200
     4.2 +++ b/android/external/armeabi-v7a/Makefile	Mon Oct 19 16:46:06 2020 +0200
     4.3 @@ -194,9 +194,6 @@
     4.4  
     4.5  #------------------------------------------------------------------------------#
     4.6  # Sequoia
     4.7 -OPENSSL_VERSION=1.1.1b
     4.8 -GMP_VERSION=6.1.2
     4.9 -NETTLE_VERSION=3.4.1
    4.10  
    4.11  sequoia-deps-build: openssl-install nettle-install
    4.12  
    4.13 @@ -330,7 +327,7 @@
    4.14  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
    4.15  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
    4.16  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
    4.17 -	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target armv7-linux-androideabi -p sequoia-openpgp-ffi --release
    4.18 +	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
    4.19  
    4.20  
    4.21  $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/armv7-linux-androideabi/release/libsequoia_openpgp_ffi.so
     5.1 --- a/android/external/downloads/gmp-6.1.2.tar.bz2.md5	Fri Oct 09 17:35:08 2020 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,1 +0,0 @@
     5.4 -8ddbb26dc3bd4e2302984debba1406a5  gmp-6.1.2.tar.bz2
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/android/external/downloads/gmp-6.2.0.tar.bz2.md5	Mon Oct 19 16:46:06 2020 +0200
     6.3 @@ -0,0 +1,1 @@
     6.4 +c24161e0dd44cae78cd5f67193492a21  gmp-6.2.0.tar.bz2
     7.1 --- a/android/external/downloads/nettle-3.4.1.tar.gz.md5	Fri Oct 09 17:35:08 2020 +0200
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,1 +0,0 @@
     7.4 -9bdebb0e2f638d3b9d91f7fc264b70c1  nettle-3.4.1.tar.gz
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/android/external/downloads/nettle-3.6.tar.gz.md5	Mon Oct 19 16:46:06 2020 +0200
     8.3 @@ -0,0 +1,1 @@
     8.4 +c45ee24ed7361dcda152a035d396fe8a  nettle-3.6.tar.gz
     9.1 --- a/android/external/downloads/openssl-1.1.1b.tar.gz.md5	Fri Oct 09 17:35:08 2020 +0200
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,1 +0,0 @@
     9.4 -4532712e7bcc9414f5bce995e4e13930  openssl-1.1.1b.tar.gz
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/android/external/downloads/openssl-1.1.1h.tar.gz.md5	Mon Oct 19 16:46:06 2020 +0200
    10.3 @@ -0,0 +1,1 @@
    10.4 +53840c70434793127a3574433494e8d3  openssl-1.1.1h.tar.gz
    11.1 --- a/android/external/x86/Makefile	Fri Oct 09 17:35:08 2020 +0200
    11.2 +++ b/android/external/x86/Makefile	Mon Oct 19 16:46:06 2020 +0200
    11.3 @@ -327,7 +327,7 @@
    11.4  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
    11.5  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
    11.6  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
    11.7 -	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target i686-linux-android -p sequoia-openpgp-ffi --release
    11.8 +	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
    11.9  
   11.10  
   11.11  $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/i686-linux-android/release/libsequoia_openpgp_ffi.so
    12.1 --- a/android/external/x86_64/Makefile	Fri Oct 09 17:35:08 2020 +0200
    12.2 +++ b/android/external/x86_64/Makefile	Mon Oct 19 16:46:06 2020 +0200
    12.3 @@ -327,7 +327,7 @@
    12.4  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
    12.5  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
    12.6  	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
    12.7 -	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target x86_64-linux-android -p sequoia-openpgp-ffi --release
    12.8 +	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
    12.9  
   12.10  
   12.11  $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/x86_64-linux-android/release/libsequoia_openpgp_ffi.so
    13.1 --- a/android/src/foundation/pEp/jniadapter/AndroidHelper.java	Fri Oct 09 17:35:08 2020 +0200
    13.2 +++ b/android/src/foundation/pEp/jniadapter/AndroidHelper.java	Mon Oct 19 16:46:06 2020 +0200
    13.3 @@ -28,7 +28,7 @@
    13.4      private static File tmpDir;
    13.5          
    13.6      // TODO : Increment when needed.
    13.7 -    public static int ENGINE_VERSION_CODE = 4768;
    13.8 +    public static int ENGINE_VERSION_CODE = 5115;
    13.9  
   13.10      private static File shareDir;
   13.11