commit 2d109594b50e657eb3034743d0a816dd537942d2
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jul 17 15:23:48 2017 +0200
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jul 17 15:39:22 2017 +0200
tree aca64331afe809168ce25d7953b1eeff6f62ac4f
parent b72e1447b03fca675527c8e9a1ad8ce48edd86c2

Update ndn-cxx to include TLV decoding fix

Change-Id: I4ae70ad0f7333a69e059dcc8f835eb9027ee1d23
Refs: #4174

.gitmodules

diff --git a/.gitmodules b/.gitmodules
index d011c56..96a2d18 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,7 +4,8 @@
     branch = android
 [submodule "app/src/main/jni/ndn-cxx"]
     path = app/src/main/jni/ndn-cxx
-    url = https://github.com/named-data/ndn-cxx
+    url = https://github.com/cawka/ndn-cxx
+    branch = 0.5.0-android-hotfix
 [submodule "app/src/main/jni/NFD"]
     path = app/src/main/jni/NFD
     url = https://github.com/named-data/NFD

app/build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index b06138c..909fae0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@
         applicationId "net.named_data.nfd"
         minSdkVersion 15
         targetSdkVersion 19
-        versionCode 4003
-        versionName "0.2.3 (NFD 0.5.0)"
+        versionCode 4004
+        versionName "0.2.4 (NFD 0.5.0, ndn-cxx 0.5.0-11-g1cf4146e)"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

app/src/main/jni/ndn-cxx

diff --git a/app/src/main/jni/ndn-cxx b/app/src/main/jni/ndn-cxx
index ed1e99d..1cf4146 160000
--- a/app/src/main/jni/ndn-cxx
+++ b/app/src/main/jni/ndn-cxx
@@ -1 +1 @@
-Subproject commit ed1e99daa08642822cb722136294724ec5a9cf26
+Subproject commit 1cf4146eb9d5ea5604072e096bf11e2dffa136eb