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

JNI-177 Update libetpan to use autoconf and build for current arch 

This saves time and space but also requires to drop support for Android <21 (5.0), its fine as now a days android 22 is like 98% of market.
JNI-177
Hussein Kasem 3 years ago
parent
7e24b3fd59
commit
143b8eafa0
No known key found for this signature in database GPG Key ID: 9E61B9BC790E6B02
6 changed files with 19 additions and 18 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. 2
      android/build.gradle
  2. 7
      android/external/Makefile.conf
  3. 7
      android/external/arm64-v8a/Makefile
  4. 7
      android/external/armeabi-v7a/Makefile
  5. 7
      android/external/x86/Makefile
  6. 7
      android/external/x86_64/Makefile

2
android/build.gradle
View File

@ -30,7 +30,7 @@ android {
compileSdkVersion 30 compileSdkVersion 30
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 7 versionCode 7
versionName "2.1.29" versionName "2.1.29"

7
android/external/Makefile.conf
View File

@ -2,6 +2,7 @@
### Android NDK Common conf ### Android NDK Common conf
NDK_TOOLCHAIN_COMPILER ?= clang NDK_TOOLCHAIN_COMPILER ?= clang
ANDROID_API ?= 21
### Select GNU SED on MacOS. ### Select GNU SED on MacOS.
@ -21,7 +22,7 @@ GMP_VERSION=6.2.1
NETTLE_VERSION=3.7.3 NETTLE_VERSION=3.7.3
### Git deps repos ### Git deps repos
EXTERNAL_GIT_REPOS += libetpan|https://gitea.pep.foundation/pEp.foundation/libetpan.git?0123f34ec4ef7711b3670b744b3ae7e97178afe1 EXTERNAL_GIT_REPOS += libetpan|https://gitea.pep.foundation/pEp.foundation/libetpan.git?507ab94fc9609432ef2d4c62770139482f1b5084
EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.3.1 EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.3.1
### Common variables ### Common variables
@ -40,3 +41,7 @@ EXTERNAL_SRCS_CLEAN += gmp-clean
EXTERNAL_SRCS_CLEAN += nettle-clean EXTERNAL_SRCS_CLEAN += nettle-clean
EXTERNAL_SRCS_CLEAN += sequoia-ffi-clean EXTERNAL_SRCS_CLEAN += sequoia-ffi-clean
### Other variables
ANDROID_ETPAN_BUILD_VERSION=2

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

@ -14,7 +14,6 @@ include ../Makefile.conf
# Build parameters # Build parameters
APP_ABI ?= arm64-v8a APP_ABI ?= arm64-v8a
ANDROID_API ?= 21
all: build all: build
@ -123,9 +122,9 @@ libetpan.src.stamp: ../downloads/libetpan.tar.gz
touch $@ touch $@
libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan/Makefile: libetpan.src.stamp | libiconv-install
cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh $(APP_ABI)
cp -r libetpan/build-android/libetpan-android-1/$(APP_ABI)/lib/* $(LOCAL)/lib/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/$(APP_ABI)/lib/* $(LOCAL)/lib/
cp -r libetpan/build-android/libetpan-android-1/include/* $(LOCAL)/include/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/include/* $(LOCAL)/include/
touch $@ touch $@
libetpan-build: libetpan/Makefile libetpan-build: libetpan/Makefile

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

@ -14,7 +14,6 @@ include ../Makefile.conf
# Build parameters # Build parameters
APP_ABI ?= armeabi-v7a APP_ABI ?= armeabi-v7a
ANDROID_API ?= 18
all: build all: build
#assets #assets
@ -126,9 +125,9 @@ libetpan.src.stamp: ../downloads/libetpan.tar.gz
touch $@ touch $@
libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan/Makefile: libetpan.src.stamp | libiconv-install
cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh $(APP_ABI)
cp -r libetpan/build-android/libetpan-android-1/$(APP_ABI)/lib/* $(LOCAL)/lib/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/$(APP_ABI)/lib/* $(LOCAL)/lib/
cp -r libetpan/build-android/libetpan-android-1/include/* $(LOCAL)/include/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/include/* $(LOCAL)/include/
touch $@ touch $@
libetpan-build: libetpan/Makefile libetpan-build: libetpan/Makefile

7
android/external/x86/Makefile
View File

@ -14,7 +14,6 @@ include ../Makefile.conf
# Build parameters # Build parameters
APP_ABI ?= x86 APP_ABI ?= x86
ANDROID_API ?= 18
all: build all: build
@ -123,9 +122,9 @@ libetpan.src.stamp: ../downloads/libetpan.tar.gz
touch $@ touch $@
libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan/Makefile: libetpan.src.stamp | libiconv-install
cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh $(APP_ABI)
cp -r libetpan/build-android/libetpan-android-1/$(APP_ABI)/lib/* $(LOCAL)/lib/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/$(APP_ABI)/lib/* $(LOCAL)/lib/
cp -r libetpan/build-android/libetpan-android-1/include/* $(LOCAL)/include/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/include/* $(LOCAL)/include/
touch $@ touch $@
libetpan-build: libetpan/Makefile libetpan-build: libetpan/Makefile

7
android/external/x86_64/Makefile
View File

@ -14,7 +14,6 @@ include ../Makefile.conf
# Build parameters # Build parameters
APP_ABI ?= x86_64 APP_ABI ?= x86_64
ANDROID_API ?= 21
all: build all: build
@ -123,9 +122,9 @@ libetpan.src.stamp: ../downloads/libetpan.tar.gz
touch $@ touch $@
libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan/Makefile: libetpan.src.stamp | libiconv-install
cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) bash ./build.sh $(APP_ABI)
cp -r libetpan/build-android/libetpan-android-1/$(APP_ABI)/lib/* $(LOCAL)/lib/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/$(APP_ABI)/lib/* $(LOCAL)/lib/
cp -r libetpan/build-android/libetpan-android-1/include/* $(LOCAL)/include/ cp -r libetpan/build-android/libetpan-android-$(ANDROID_ETPAN_BUILD_VERSION)/include/* $(LOCAL)/include/
touch $@ touch $@
libetpan-build: libetpan/Makefile libetpan-build: libetpan/Makefile

Write Preview
Loading…
Cancel
Save