diff --git a/app/src/main/jni/nfd.mk b/app/src/main/jni/nfd.mk
index 04cf7e3..2cacc03 100644
--- a/app/src/main/jni/nfd.mk
+++ b/app/src/main/jni/nfd.mk
@@ -7,8 +7,18 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := nfd-core
 LOCAL_SHARED_LIBRARIES := cryptopp ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
-NFD_CORE_SRC_FILES := core/network.cpp core/config-file.cpp core/network-interface.cpp core/logger-factory.cpp core/privilege-helper.cpp core/city-hash.cpp core/scheduler.cpp core/global-io.cpp core/logger.cpp core/random.cpp
-LOCAL_SRC_FILES := $(addprefix NFD/,$(NFD_CORE_SRC_FILES))
+NFD_CORE_SRC_FILES := \
+    core/city-hash.cpp \
+    core/config-file.cpp \
+    core/global-io.cpp \
+    core/network-interface.cpp \
+    core/network.cpp \
+    core/privilege-helper.cpp \
+    core/random.cpp \
+    core/scheduler.cpp
+LOCAL_SRC_FILES := $(addprefix NFD/,$(NFD_CORE_SRC_FILES)) \
+    nfd-android/custom-logger.cpp \
+    nfd-android/custom-logger-factory.cpp
 LOCAL_CPPFLAGS := -I$(LOCAL_PATH)/nfd-android -I$(LOCAL_PATH)/NFD -I$(LOCAL_PATH)/NFD/core
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/nfd-android $(LOCAL_PATH)/NFD $(LOCAL_PATH)/NFD/core
 include $(BUILD_STATIC_LIBRARY)
@@ -18,17 +28,78 @@
 LOCAL_MODULE := nfd-daemon
 LOCAL_SHARED_LIBRARIES := cryptopp ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
 LOCAL_STATIC_LIBRARIES := nfd-core
-NFD_DAEMON_SRC_FILES := daemon/face/ndnlp-sequence-generator.cpp daemon/face/udp-channel.cpp daemon/face/ndnlp-partial-message-store.cpp daemon/face/ndnlp-parse.cpp daemon/face/face.cpp daemon/face/null-face.cpp daemon/face/tcp-factory.cpp daemon/face/ndnlp-slicer.cpp daemon/face/udp-face.cpp daemon/face/multicast-udp-face.cpp daemon/face/channel.cpp daemon/face/tcp-channel.cpp daemon/face/tcp-face.cpp daemon/face/udp-factory.cpp daemon/main.cpp daemon/table/measurements-accessor.cpp daemon/table/pit-out-record.cpp daemon/table/fib-entry.cpp daemon/table/pit-in-record.cpp daemon/table/measurements-entry.cpp daemon/table/strategy-choice.cpp daemon/table/cs-entry.cpp daemon/table/pit.cpp daemon/table/measurements.cpp daemon/table/strategy-info-host.cpp daemon/table/pit-face-record.cpp daemon/table/fib.cpp daemon/table/cs-entry-impl.cpp daemon/table/fib-nexthop.cpp daemon/table/name-tree.cpp daemon/table/name-tree-entry.cpp daemon/table/cs.cpp daemon/table/pit-entry.cpp daemon/table/strategy-choice-entry.cpp daemon/table/cs-skip-list-entry.cpp daemon/table/dead-nonce-list.cpp daemon/fw/access-strategy.cpp daemon/fw/retransmission-suppression.cpp daemon/fw/strategy.cpp daemon/fw/rtt-estimator.cpp daemon/fw/broadcast-strategy.cpp daemon/fw/client-control-strategy.cpp daemon/fw/best-route-strategy.cpp daemon/fw/face-table.cpp daemon/fw/ncc-strategy.cpp daemon/fw/forwarder.cpp daemon/fw/best-route-strategy2.cpp daemon/fw/available-strategies.cpp daemon/mgmt/status-server.cpp daemon/mgmt/tables-config-section.cpp daemon/mgmt/channel-status-publisher.cpp daemon/mgmt/strategy-choice-publisher.cpp daemon/mgmt/general-config-section.cpp daemon/mgmt/command-validator.cpp daemon/mgmt/internal-face.cpp daemon/mgmt/fib-enumeration-publisher.cpp daemon/mgmt/face-manager.cpp daemon/mgmt/manager-base.cpp daemon/mgmt/face-status-publisher.cpp daemon/mgmt/strategy-choice-manager.cpp daemon/mgmt/face-query-status-publisher.cpp daemon/mgmt/fib-manager.cpp
+NFD_DAEMON_SRC_FILES := \
+    daemon/face/channel.cpp \
+    daemon/face/face.cpp \
+    daemon/face/multicast-udp-face.cpp \
+    daemon/face/ndnlp-parse.cpp \
+    daemon/face/ndnlp-partial-message-store.cpp \
+    daemon/face/ndnlp-sequence-generator.cpp \
+    daemon/face/ndnlp-slicer.cpp \
+    daemon/face/null-face.cpp \
+    daemon/face/tcp-channel.cpp \
+    daemon/face/tcp-face.cpp \
+    daemon/face/tcp-factory.cpp \
+    daemon/face/udp-channel.cpp \
+    daemon/face/udp-face.cpp \
+    daemon/face/udp-factory.cpp \
+    daemon/fw/access-strategy.cpp \
+    daemon/fw/available-strategies.cpp \
+    daemon/fw/best-route-strategy.cpp \
+    daemon/fw/best-route-strategy2.cpp \
+    daemon/fw/broadcast-strategy.cpp \
+    daemon/fw/client-control-strategy.cpp \
+    daemon/fw/face-table.cpp \
+    daemon/fw/forwarder.cpp \
+    daemon/fw/ncc-strategy.cpp \
+    daemon/fw/retx-suppression-fixed.cpp \
+    daemon/fw/rtt-estimator.cpp \
+    daemon/fw/strategy.cpp \
+    daemon/nfd.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/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/table/cs-entry-impl.cpp \
+    daemon/table/cs-entry.cpp \
+    daemon/table/cs-skip-list-entry.cpp \
+    daemon/table/cs.cpp \
+    daemon/table/dead-nonce-list.cpp \
+    daemon/table/fib-entry.cpp \
+    daemon/table/fib-nexthop.cpp \
+    daemon/table/fib.cpp \
+    daemon/table/measurements-accessor.cpp \
+    daemon/table/measurements-entry.cpp \
+    daemon/table/measurements.cpp \
+    daemon/table/name-tree-entry.cpp \
+    daemon/table/name-tree.cpp \
+    daemon/table/pit-entry.cpp \
+    daemon/table/pit-face-record.cpp \
+    daemon/table/pit-in-record.cpp \
+    daemon/table/pit-out-record.cpp \
+    daemon/table/pit.cpp \
+    daemon/table/strategy-choice-entry.cpp \
+    daemon/table/strategy-choice.cpp \
+    daemon/table/strategy-info-host.cpp \
+    \
+    rib/fib-update.cpp \
+    rib/nrd.cpp \
+    rib/remote-registrator.cpp \
+    rib/rib-entry.cpp \
+    rib/rib-manager.cpp \
+    rib/rib-status-publisher.cpp \
+    rib/rib.cpp
 LOCAL_SRC_FILES := $(addprefix NFD/,$(NFD_DAEMON_SRC_FILES))
-LOCAL_CPPFLAGS := -I$(LOCAL_PATH)/NFD/daemon
-include $(BUILD_SHARED_LIBRARY)
-
-# rib manager
-include $(CLEAR_VARS)
-LOCAL_MODULE := nfd-rib
-LOCAL_SHARED_LIBRARIES := cryptopp ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
-LOCAL_STATIC_LIBRARIES := nfd-core
-NFD_DAEMON_SRC_FILES := rib/fib-update.cpp rib/main.cpp rib/remote-registrator.cpp rib/rib-entry.cpp rib/rib-manager.cpp rib/rib-status-publisher.cpp rib/rib.cpp
-LOCAL_SRC_FILES := $(addprefix NFD/,$(NFD_DAEMON_SRC_FILES))
-LOCAL_CPPFLAGS := -I$(LOCAL_PATH)/NFD/rib
+LOCAL_CPPFLAGS := -I$(LOCAL_PATH)/NFD/daemon -I$(LOCAL_PATH)/NFD/rib
+LOCAL_LDLIBS := -llog
 include $(BUILD_SHARED_LIBRARY)