From be2ceece4ef36b833a8781de96093777dd974bc8 Mon Sep 17 00:00:00 2001 From: Damiano Boppart Date: Fri, 8 Feb 2019 17:20:52 +0100 Subject: [PATCH 1/4] Add ignore rule --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index b719f52..4c69381 100644 --- a/.hgignore +++ b/.hgignore @@ -64,6 +64,7 @@ androidTests/gradle/wrapper/gradle-wrapper.properties androidTests/gradlew androidTests/gradlew.bat src/org.tar.gz +src/local.conf syntax: regexp android/external/[^.]* From b098f1869c7989eae45a3a1210c7e2b569ead7ec Mon Sep 17 00:00:00 2001 From: Damiano Boppart Date: Fri, 8 Feb 2019 17:22:12 +0100 Subject: [PATCH 2/4] Remove redundant doc file --- README.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 README.txt diff --git a/README.txt b/README.txt deleted file mode 100644 index 9269728..0000000 --- a/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -p≡p JNI Adapter -=============== - From 856816d752078070eaf9fcab8a9f5ea4f7ae97bc Mon Sep 17 00:00:00 2001 From: Damiano Boppart Date: Mon, 11 Feb 2019 17:15:55 +0100 Subject: [PATCH 3/4] Add link to wiki documentation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2e86527..aacc7b8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # p≡p JNI Adapter +More complete developer instructions can be found here: [https://dev.pep.foundation/JNI%20Adapter/Tutorial](). ## Prerequisites From 8e23bc295da73c3399d5b2ca2f2673c82bb76454 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Tue, 19 Feb 2019 18:03:19 +0100 Subject: [PATCH 4/4] Switch to c++_shared instead of static --- android/jni/Android.mk | 3 ++- android/jni/Application.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index bad76b9..94a658e 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -59,7 +59,7 @@ LOCAL_MODULE := pEpJNI LOCAL_SHARED_LIBRARIES := libgpgme libassuan libcurl libgcrypt libgpg-error LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid LOCAL_CPP_FEATURES += exceptions -LOCAL_CFLAGS += -DHAVE_PTHREADS +LOCAL_CFLAGS += -DHAVE_PTHREADS -DANDROID_STL=c++_shared LOCAL_SRC_FILES := \ ../../src/org_pEp_jniadapter_AbstractEngine.cc \ ../../src/org_pEp_jniadapter_Engine.cc \ @@ -75,6 +75,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := pEpJNIAndroidHelper LOCAL_SHARED_LIBRARIES := libgpgme +LOCAL_CFLAGS += -DANDROID_STL=c++_shared LOCAL_SRC_FILES := org_pEp_jniadapter_AndroidHelper.cc include $(BUILD_SHARED_LIBRARY) diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 2740c89..0e7d1e7 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,4 +1,4 @@ -APP_STL := c++_static +APP_STL := c++_shared APP_OPTIM := debug APP_PLATFORM=android-18 APP_ABI := armeabi-v7a