Merge with default

.hgignore

@@ -65,6 +65,7 @@ androidTests/gradle/wrapper/gradle-wrapper.properties
 androidTests/gradlew
 androidTests/gradlew.bat
 src/org.tar.gz
+src/local.conf
 
 syntax: regexp
 android/external/[^.]*

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
 

README.txt

@@ -1,3 +0,0 @@
-p≡p JNI Adapter
-===============
-

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)

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