#11 Android build: Update sequoia to 1.3.0 and get rid of cargo experimental for the build.

Merged
heck merged 1 commits from android-build into Release_2.1 6 months ago
  1. +2
    -2
      android/build.gradle
  2. +1
    -1
      android/external/Makefile.conf
  3. +2
    -1
      android/external/arm64-v8a/Makefile
  4. +2
    -1
      android/external/armeabi-v7a/Makefile
  5. +3
    -2
      android/external/x86/Makefile
  6. +2
    -1
      android/external/x86_64/Makefile
  7. +1
    -1
      android/src/foundation/pEp/jniadapter/AndroidHelper.java

+ 2
- 2
android/build.gradle View File

@ -32,8 +32,8 @@ android {
defaultConfig {
minSdkVersion 19
targetSdkVersion 30
versionCode 6
versionName "2.1.27"
versionCode 7
versionName "2.1.29"
externalNativeBuild {
ndkBuild {


+ 1
- 1
android/external/Makefile.conf View File

@ -20,7 +20,7 @@ NETTLE_VERSION=3.7.3
### 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?openpgp/v1.1.0
EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.3.0
### Common variables
#### Source code targets


+ 2
- 1
android/external/arm64-v8a/Makefile View File

@ -314,6 +314,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
sequoia.src.stamp: ../downloads/sequoia.tar.gz
mkdir -p sequoia
cd sequoia && tar xvf ../$<
cd sequoia && cargo update -p nettle-sys --precise 2.0.8
touch $@
sequoia-ffi-clean:
@ -328,7 +329,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) rustup run nightly cargo build --target aarch64-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target aarch64-linux-android -p sequoia-openpgp-ffi --release
$(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/


+ 2
- 1
android/external/armeabi-v7a/Makefile View File

@ -313,6 +313,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build
sequoia.src.stamp: ../downloads/sequoia.tar.gz
mkdir -p sequoia
cd sequoia && tar xvf ../$<
cd sequoia && cargo update -p nettle-sys --precise 2.0.8
touch $@
sequoia-ffi-clean:
@ -327,7 +328,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) rustup run nightly cargo build --target armv7-linux-androideabi -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target armv7-linux-androideabi -p sequoia-openpgp-ffi --release
$(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/armv7-linux-androideabi/release/libsequoia_openpgp_ffi.so


+ 3
- 2
android/external/x86/Makefile View File

@ -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
@ -313,6 +313,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
sequoia.src.stamp: ../downloads/sequoia.tar.gz
mkdir -p sequoia
cd sequoia && tar xvf ../$<
cd sequoia && cargo update -p nettle-sys --precise 2.0.8
touch $@
sequoia-ffi-clean:
@ -327,7 +328,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) rustup run nightly cargo build --target i686-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target i686-linux-android -p sequoia-openpgp-ffi --release
$(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/i686-linux-android/release/libsequoia_openpgp_ffi.so


+ 2
- 1
android/external/x86_64/Makefile View File

@ -313,6 +313,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
sequoia.src.stamp: ../downloads/sequoia.tar.gz
mkdir -p sequoia
cd sequoia && tar xvf ../$<
cd sequoia && cargo update -p nettle-sys --precise 2.0.8
touch $@
sequoia-ffi-clean:
@ -327,7 +328,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) rustup run nightly cargo build --target x86_64-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target x86_64-linux-android -p sequoia-openpgp-ffi --release
$(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/x86_64-linux-android/release/libsequoia_openpgp_ffi.so


+ 1
- 1
android/src/foundation/pEp/jniadapter/AndroidHelper.java View File

@ -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.33";
public static String ENGINE_VERSION_CODE = "Release_2.1.37";
private static File shareDir;


Loading…
Cancel
Save