commit 150c264378dae899c032dcffe75eda78e28e410e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Sep 11 01:10:55 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Sep 18 11:40:54 2015 -0700
tree 4725598a56a3cbfd7ad477b65510eed5eadea449
parent acbe16b2e1b0b16bc700ab8fdfea0028ce522740

jni: Upgrade NFD and ndn-cxx to the latest dev releases

- NFD version 0.3.4-16-g441ba21
- ndn-cxx version 0.3.4-9-g80b68e1

Change-Id: Ia2097e2693488965503a32a90266a450246536b3

app/src/main/jni/NFD

diff --git a/app/src/main/jni/NFD b/app/src/main/jni/NFD
index 2fc649b..441ba21 160000
--- a/app/src/main/jni/NFD
+++ b/app/src/main/jni/NFD
@@ -1 +1 @@
-Subproject commit 2fc649bfc67b93b4191cfbee5bcd70330bfb48f0
+Subproject commit 441ba2175e194c45807fda4acae6f23b6dc40298

app/src/main/jni/ndn-cxx

diff --git a/app/src/main/jni/ndn-cxx b/app/src/main/jni/ndn-cxx
index 6fa5297..80b68e1 160000
--- a/app/src/main/jni/ndn-cxx
+++ b/app/src/main/jni/ndn-cxx
@@ -1 +1 @@
-Subproject commit 6fa52970f35a58df85dae9c1cca7be6c58ab7d0a
+Subproject commit 80b68e17c484b27bf7b623f86b6c628d48466998

app/src/main/jni/nfd-android/version.hpp

diff --git a/app/src/main/jni/nfd-android/version.hpp b/app/src/main/jni/nfd-android/version.hpp
index e1ebc6f..f213551 100644
--- a/app/src/main/jni/nfd-android/version.hpp
+++ b/app/src/main/jni/nfd-android/version.hpp
@@ -60,7 +60,7 @@
  *
  * Example, 0.1.0-rc1-1-g5c86570
  */
-#define NFD_VERSION_BUILD_STRING "0.3.4"
+#define NFD_VERSION_BUILD_STRING "0.3.4-16-g441ba21"
 
 /// MAJOR version
 #define NFD_VERSION_MAJOR 0

app/src/main/jni/nfd.mk

diff --git a/app/src/main/jni/nfd.mk b/app/src/main/jni/nfd.mk
index 1b8ea60..2a63b03 100644
--- a/app/src/main/jni/nfd.mk
+++ b/app/src/main/jni/nfd.mk
@@ -31,6 +31,8 @@
 NFD_DAEMON_SRC_FILES := \
     daemon/face/channel.cpp \
     daemon/face/face.cpp \
+    daemon/face/internal-client-face.cpp \
+    daemon/face/internal-face.cpp \
     daemon/face/multicast-udp-face.cpp \
     daemon/face/ndnlp-data.cpp \
     daemon/face/ndnlp-partial-message-store.cpp \
@@ -61,19 +63,13 @@
     daemon/fw/rtt-estimator.cpp \
     daemon/fw/strategy-registry.cpp \
     daemon/fw/strategy.cpp \
-    daemon/mgmt/channel-status-publisher.cpp \
     daemon/mgmt/command-validator.cpp \
     daemon/mgmt/face-manager.cpp \
-    daemon/mgmt/face-query-status-publisher.cpp \
-    daemon/mgmt/face-status-publisher.cpp \
-    daemon/mgmt/fib-enumeration-publisher.cpp \
     daemon/mgmt/fib-manager.cpp \
+    daemon/mgmt/forwarder-status-manager.cpp \
     daemon/mgmt/general-config-section.cpp \
-    daemon/mgmt/internal-face.cpp \
     daemon/mgmt/manager-base.cpp \
-    daemon/mgmt/status-server.cpp \
     daemon/mgmt/strategy-choice-manager.cpp \
-    daemon/mgmt/strategy-choice-publisher.cpp \
     daemon/mgmt/tables-config-section.cpp \
     daemon/nfd.cpp \
     daemon/table/cs-entry-impl.cpp \
@@ -91,6 +87,7 @@
     daemon/table/measurements.cpp \
     daemon/table/name-tree-entry.cpp \
     daemon/table/name-tree.cpp \
+    daemon/table/network-region-table.cpp \
     daemon/table/pit-entry.cpp \
     daemon/table/pit-face-record.cpp \
     daemon/table/pit-in-record.cpp \