pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

JNI-101 Release_2.1.4
heck 5 years ago
parent
5a11b89546 4abc35c17c
commit
6183eb7a59
13 changed files with 17 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      android/build.gradle
  2. 8
      android/external/Makefile.conf
  3. 5
      android/external/arm64-v8a/Makefile
  4. 5
      android/external/armeabi-v7a/Makefile
  5. 1
      android/external/downloads/gmp-6.1.2.tar.bz2.md5
  6. 1
      android/external/downloads/gmp-6.2.0.tar.bz2.md5
  7. 1
      android/external/downloads/nettle-3.4.1.tar.gz.md5
  8. 1
      android/external/downloads/nettle-3.6.tar.gz.md5
  9. 1
      android/external/downloads/openssl-1.1.1b.tar.gz.md5
  10. 1
      android/external/downloads/openssl-1.1.1h.tar.gz.md5
  11. 2
      android/external/x86/Makefile
  12. 2
      android/external/x86_64/Makefile
  13. 2
      android/src/foundation/pEp/jniadapter/AndroidHelper.java

8
android/build.gradle
View File

@ -13,7 +13,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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 { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 30
versionCode 2 versionCode 3
versionName "2.1.0-RC5" versionName "2.1.4"
externalNativeBuild { externalNativeBuild {
ndkBuild { ndkBuild {
@ -94,7 +94,7 @@ android {
// call source generation makefile target // call source generation makefile target
task genSources(type:Exec, dependsOn: 'genpEpEngineAsn1Sources') { task genSources(type:Exec, dependsOn: 'genpEpEngineAsn1Sources') {
workingDir '../src' workingDir '../src'
commandLine 'make', "-j${threadsToUse}", 'pEp.jar' commandLine 'make', 'pEp.jar'
} }
task genpEpEngineSyncSources(type:Exec) { task genpEpEngineSyncSources(type:Exec) {

8
android/external/Makefile.conf
View File

@ -14,13 +14,13 @@ else
endif endif
### Sequoia deps versions ### Sequoia deps versions
OPENSSL_VERSION=1.1.1b OPENSSL_VERSION=1.1.1h
GMP_VERSION=6.1.2 GMP_VERSION=6.2.0
NETTLE_VERSION=3.4.1 NETTLE_VERSION=3.6
### Git deps repos ### Git deps repos
EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD 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 ### Common variables
#### Source code targets #### Source code targets

5
android/external/arm64-v8a/Makefile
View File

@ -222,7 +222,7 @@ $(LOCAL)/lib/libssl.so: openssl/libssl.so
cp libcrypto.so $(LOCAL)/lib && \ cp libcrypto.so $(LOCAL)/lib && \
cp libcrypto.a $(LOCAL)/lib && \ cp libcrypto.a $(LOCAL)/lib && \
cp libssl.so $(LOCAL)/lib && \ cp libssl.so $(LOCAL)/lib && \
cp libssl.a $(LOCAL)/lib cp libssl.a $(LOCAL)/lib
ls -l $(LOCAL)/lib/libssl.so ls -l $(LOCAL)/lib/libssl.so
openssl-build: openssl/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_LIB_DIR="$(LOCAL)/lib" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \ ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \ 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 $(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/ cp $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.* $(LOCAL)/lib/

5
android/external/armeabi-v7a/Makefile
View File

@ -194,9 +194,6 @@ uuid/jni/Android.mk: uuid.src.stamp
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# Sequoia # Sequoia
OPENSSL_VERSION=1.1.1b
GMP_VERSION=6.1.2
NETTLE_VERSION=3.4.1
sequoia-deps-build: openssl-install nettle-install 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_LIB_DIR="$(LOCAL)/lib" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \ ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \ 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 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/armv7-linux-androideabi/release/libsequoia_openpgp_ffi.so

1
android/external/downloads/gmp-6.1.2.tar.bz2.md5
View File

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

1
android/external/downloads/gmp-6.2.0.tar.bz2.md5
View File

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

1
android/external/downloads/nettle-3.4.1.tar.gz.md5
View File

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

1
android/external/downloads/nettle-3.6.tar.gz.md5
View File

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

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

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

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

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

2
android/external/x86/Makefile
View File

@ -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_LIB_DIR="$(LOCAL)/lib" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \ ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \ 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 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/i686-linux-android/release/libsequoia_openpgp_ffi.so

2
android/external/x86_64/Makefile
View File

@ -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_LIB_DIR="$(LOCAL)/lib" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \ ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \ 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 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/x86_64-linux-android/release/libsequoia_openpgp_ffi.so

2
android/src/foundation/pEp/jniadapter/AndroidHelper.java
View File

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

Write Preview
Loading…
Cancel
Save