commit f381256a125aa2218423226288629ff37caa267e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 21 16:28:33 2016 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 22 19:14:03 2016 -0800
tree 45113b5811b34b36d96272ac7509671fa670494d
parent bd74ad2f6bb3833a32c8ba5615754365ab424f2a

ndk+ci: Upgrade to use CrystaX NDK 10.3.1 and a more recent version of Crypto++ library

This commit also fixes checks with Travis-CI that were effectively broken before.

Change-Id: Ibf9e54de47db00ed01534187a19a3d40e9dee84e

app/src/main/jni/ndn-cxx.mk

diff --git a/app/src/main/jni/ndn-cxx.mk b/app/src/main/jni/ndn-cxx.mk
index fc758f6..9ebba73 100644
--- a/app/src/main/jni/ndn-cxx.mk
+++ b/app/src/main/jni/ndn-cxx.mk
@@ -4,7 +4,7 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := ndn-cxx
 NDN_CXX_BOOST_LIBS = system filesystem date_time iostreams program_options chrono random
-LOCAL_SHARED_LIBRARIES := cryptopp $(addsuffix _shared,$(addprefix boost_,$(NDN_CXX_BOOST_LIBS)))
+LOCAL_SHARED_LIBRARIES := cryptopp_shared $(addsuffix _shared,$(addprefix boost_,$(NDN_CXX_BOOST_LIBS)))
 LOCAL_STATIC_LIBRARIES := sqlite3_static boost_regex_static
 NDN_CXX_SRC_FILES := \
     data.cpp \
@@ -114,7 +114,7 @@
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ndn-cxx-android
 include $(BUILD_SHARED_LIBRARY)
 
-include $(LOCAL_PATH_SAVED)/cryptopp/Android.mk
+include $(LOCAL_PATH_SAVED)/cryptopp/extras/jni/Android.mk
 
-$(call import-module,boost/1.57.0)
+$(call import-module,boost/1.59.0)
 $(call import-module,sqlite/3)