ndk+ci: Upgrade to use CrystaX NDK 10.3.1 and a more recent version of Crypto++ library
This commit also fixes checks with Travis-CI that were effectively broken before.
Change-Id: Ibf9e54de47db00ed01534187a19a3d40e9dee84e
diff --git a/app/src/main/java/net/named_data/nfd/service/NfdService.java b/app/src/main/java/net/named_data/nfd/service/NfdService.java
index 1b43df3..74adec3 100644
--- a/app/src/main/java/net/named_data/nfd/service/NfdService.java
+++ b/app/src/main/java/net/named_data/nfd/service/NfdService.java
@@ -57,7 +57,7 @@
// bash android-shared-lib-dependencies.sh nfd-wrapper
System.loadLibrary("crystax");
System.loadLibrary("gnustl_shared");
- System.loadLibrary("cryptopp");
+ System.loadLibrary("cryptopp_shared");
System.loadLibrary("boost_system");
System.loadLibrary("boost_filesystem");
System.loadLibrary("boost_date_time");
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 3eed95a..4ab6a50 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -11,4 +11,4 @@
include $(LOCAL_PATH_SAVED)/ndn-cxx.mk
include $(LOCAL_PATH_SAVED)/nfd.mk
-$(call import-module,boost/1.57.0)
+$(call import-module,boost/1.59.0)
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
index 121e000..976b943 100644
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -1,5 +1,7 @@
APP_ABI := all
APP_STL := gnustl_shared
-APP_GNUSTL_FORCE_CPP_FEATURES := exceptions rtti
+APP_CPPFLAGS += -fexceptions -frtti -std=c++11 -Wno-deprecated-declarations
+NDK_TOOLCHAIN_VERSION := 5
+APP_PLATFORM := android-19
diff --git a/app/src/main/jni/cryptopp b/app/src/main/jni/cryptopp
index dfa7453..3a081d5 160000
--- a/app/src/main/jni/cryptopp
+++ b/app/src/main/jni/cryptopp
@@ -1 +1 @@
-Subproject commit dfa7453a47f397bad10a662a4117ffed99638513
+Subproject commit 3a081d5e25ad1c54f27a104f8e0f01c7e2ff4145
diff --git a/app/src/main/jni/ndn-cxx.mk b/app/src/main/jni/ndn-cxx.mk
index fc758f6..9ebba73 100644
--- a/app/src/main/jni/ndn-cxx.mk
+++ b/app/src/main/jni/ndn-cxx.mk
@@ -4,7 +4,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := ndn-cxx
NDN_CXX_BOOST_LIBS = system filesystem date_time iostreams program_options chrono random
-LOCAL_SHARED_LIBRARIES := cryptopp $(addsuffix _shared,$(addprefix boost_,$(NDN_CXX_BOOST_LIBS)))
+LOCAL_SHARED_LIBRARIES := cryptopp_shared $(addsuffix _shared,$(addprefix boost_,$(NDN_CXX_BOOST_LIBS)))
LOCAL_STATIC_LIBRARIES := sqlite3_static boost_regex_static
NDN_CXX_SRC_FILES := \
data.cpp \
@@ -114,7 +114,7 @@
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ndn-cxx-android
include $(BUILD_SHARED_LIBRARY)
-include $(LOCAL_PATH_SAVED)/cryptopp/Android.mk
+include $(LOCAL_PATH_SAVED)/cryptopp/extras/jni/Android.mk
-$(call import-module,boost/1.57.0)
+$(call import-module,boost/1.59.0)
$(call import-module,sqlite/3)
diff --git a/app/src/main/jni/nfd.mk b/app/src/main/jni/nfd.mk
index 76e3cc8..c185955 100644
--- a/app/src/main/jni/nfd.mk
+++ b/app/src/main/jni/nfd.mk
@@ -6,7 +6,7 @@
# nfd itself
include $(CLEAR_VARS)
LOCAL_MODULE := nfd-daemon
-LOCAL_SHARED_LIBRARIES := cryptopp ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
+LOCAL_SHARED_LIBRARIES := cryptopp_shared ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
NFD_DAEMON_SRC_FILES := \
core/city-hash.cpp \
core/config-file.cpp \