commit a5576257c9049817b8ad29793804c47dd56200e3
author Alexander Afanasyev <aa@cs.fiu.edu> Thu May 02 16:56:40 2019 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Thu May 02 16:56:40 2019 -0400
tree d5c92d830b65aaf4fc910cab7a47051887320a58
parent a5beeed26e550fb4188c6aaab290fe3cd24c7709

jni: Upgrade NFD/ndn-cxx to version 0.6.6

Change-Id: I27feb9fa93d8c3d0533d04bb3646a9fd80f0289b

app/build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index ff8edc6..5d276d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
         applicationId "net.named_data.nfd"
         minSdkVersion 23
         targetSdkVersion 27
-        versionCode 4012
-        versionName "0.6.5-3 (NFD 0.6.5)"
+        versionCode 4013
+        versionName "0.6.6-1 (NFD 0.6.6)"
         multiDexEnabled true
     }
     compileOptions {

app/src/main/jni/Android.mk

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 6b99cba..248db74 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -9,4 +9,4 @@
 LOCAL_CFLAGS := -DBOOST_LOG_DYN_LINK=1
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,../packages/nfd/0.6.5)
+$(call import-module,../packages/nfd/0.6.6)

app/src/main/jni/nfd-wrapper.cpp

diff --git a/app/src/main/jni/nfd-wrapper.cpp b/app/src/main/jni/nfd-wrapper.cpp
index 9977083..d7ebed5 100644
--- a/app/src/main/jni/nfd-wrapper.cpp
+++ b/app/src/main/jni/nfd-wrapper.cpp
@@ -19,13 +19,13 @@
 
 #include "nfd-wrapper.hpp"
 
-#include "daemon/nfd.hpp"
-#include "rib/service.hpp"
+#include <nfd.hpp>
+#include <rib/service.hpp>
 
-#include "core/config-file.hpp"
-#include "core/global-io.hpp"
-#include "core/logger.hpp"
-#include "core/privilege-helper.hpp"
+#include <common/config-file.hpp>
+#include <common/global.hpp>
+#include <common/logger.hpp>
+#include <common/privilege-helper.hpp>
 
 #include <boost/property_tree/info_parser.hpp>
 #include <boost/thread.hpp>
@@ -38,17 +38,6 @@
 namespace nfd {
 
 
-// A little bit of cheating to make sure NFD can be properly restarted
-
-namespace scheduler {
-// defined in scheduler.cpp
-void
-resetGlobalScheduler();
-} // namespace scheduler
-
-void
-resetGlobalIoService();
-
 class Runner
 {
 public:
@@ -224,7 +213,6 @@
     NFD_LOG_INFO("Use [" << nfd::g_params["homePath"] << "] as a security storage");
 
     nfd::g_thread = boost::thread([] {
-        nfd::scheduler::resetGlobalScheduler();
         nfd::resetGlobalIoService();
 
         NFD_LOG_INFO("Starting NFD...");
@@ -243,7 +231,6 @@
         }
 
         nfd::g_runner.reset();
-        nfd::scheduler::resetGlobalScheduler();
         nfd::resetGlobalIoService();
         NFD_LOG_INFO("NFD stopped");
       });