commit 14fd3e22d69c97cadbc48f35d0da59c5296cc9f4
author Alexander Afanasyev <aa@cs.fiu.edu> Wed Jul 04 14:20:53 2018 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Fri Jul 27 11:35:00 2018 -0400
tree 2723e0baaeb9cce75586e5fdd0f095670b2fe58f
parent 4a20a88fb288403c6776f81c1d117cfc7fced122

jni: Upgrade underlying NFD to version 0.6.2-11-gd657d53

This change replaces in-project JNI compilation of ndn-cxx and NFD with
packaged versions of ndn-cxx and NFD using a customized
android-crew-staging (https://github.com/named-data-mobile/android-crew-staging).
Refer to README-dev.md for more detail.

This commit also drops Logcat views

Refs: #4661

Change-Id: Id981689475d9da3aea63bea38d925f335c25b46e

app/src/main/jni/Android.mk

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 762c358..9310d31 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -4,9 +4,9 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := nfd-wrapper
 LOCAL_SRC_FILES := nfd-wrapper.cpp
-LOCAL_SHARED_LIBRARIES := nfd-daemon ndn-cxx boost_system_shared boost_thread_shared
+LOCAL_SHARED_LIBRARIES := nfd_shared ndn_cxx_shared boost_system_shared boost_thread_shared boost_log_shared
 LOCAL_LDLIBS := -llog -latomic
+LOCAL_CFLAGS := -DBOOST_LOG_DYN_LINK=1
 include $(BUILD_SHARED_LIBRARY)
 
-include $(LOCAL_PATH_SAVED)/ndn-cxx.mk
-include $(LOCAL_PATH_SAVED)/nfd.mk
+$(call import-module,../packages/nfd/0.6.2-11-gd657d53)