jni: Update NFD and ndn-cxx to the latest available versions
This commit also enables WebSocket faces
Change-Id: Ibb049fc690836dff4d16ef22bb51d765c745fc57
diff --git a/app/src/main/jni/nfd-android/config.hpp b/app/src/main/jni/nfd-android/config.hpp
index f26c0f6..bcbd6a6 100644
--- a/app/src/main/jni/nfd-android/config.hpp
+++ b/app/src/main/jni/nfd-android/config.hpp
@@ -4,10 +4,14 @@
#define HAVE_IS_DEFAULT_CONSTRUCTIBLE 1
#define HAVE_IS_MOVE_CONSTRUCTIBLE 1
#define HAVE_CXX_OVERRIDE 1
+#define HAVE_STD_TO_STRING 1
#define HAVE_LIBRT
#define HAVE_LIBRESOLV
/*#undef HAVE_UNIX_SOCKETS*/
+#define HAVE_WEBSOCKET 1
+#define _WEBSOCKETPP_CPP11_STL_ 1
#define DEFAULT_CONFIG_FILE "./nfd.conf"
#define HAVE_CUSTOM_LOGGER 1
+#define NDEBUG 1
#endif /* W_CONFIG_HPP_WAF */
diff --git a/app/src/main/jni/nfd-android/version.hpp b/app/src/main/jni/nfd-android/version.hpp
index c945a45..e1c35fd 100644
--- a/app/src/main/jni/nfd-android/version.hpp
+++ b/app/src/main/jni/nfd-android/version.hpp
@@ -38,13 +38,13 @@
*
* MAJOR*1000000 + MINOR*1000 + PATCH
*/
-#define NFD_VERSION 3000
+#define NFD_VERSION 3001
/** \brief NFD version represented as a string
*
* MAJOR.MINOR.PATCH
*/
-#define NFD_VERSION_STRING "0.3.0"
+#define NFD_VERSION_STRING "0.3.1"
/** \brief NFD version string, including git commit information, if NFD is build from
* specific git commit
@@ -60,14 +60,14 @@
*
* Example, 0.1.0-rc1-1-g5c86570
*/
-#define NFD_VERSION_BUILD_STRING "0.3.0-18-g9a36c76"
+#define NFD_VERSION_BUILD_STRING "0.3.1-14-gce81230"
/// MAJOR version
#define NFD_VERSION_MAJOR 0
/// MINOR version
#define NFD_VERSION_MINOR 3
/// PATCH version
-#define NFD_VERSION_PATCH 0
+#define NFD_VERSION_PATCH 1
} // namespace nfd