build+ci: Upgrade NDK dependency to crystax-10.2.1
As a result of the upgrade, sqlite3 module is no longer necessary, as it
is bundled with crystax NDK.
This commit also fixes compilation issue caused by jndn-util and
jndn-management dependency (both depend on "RELEASE" version of jndn-mock and
jndn-util library, causing compatibility problem).
Change-Id: Iabc70fdd899426a3e1b35c5f6f48202deaaf0043
diff --git a/app/src/main/jni/ndn-cxx.mk b/app/src/main/jni/ndn-cxx.mk
index 0419abc..3f3fcd6 100644
--- a/app/src/main/jni/ndn-cxx.mk
+++ b/app/src/main/jni/ndn-cxx.mk
@@ -5,7 +5,7 @@
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_STATIC_LIBRARIES := sqlite3 boost_regex_static
+LOCAL_STATIC_LIBRARIES := sqlite3_static boost_regex_static
NDN_CXX_SRC_FILES := \
data.cpp \
encoding/block.cpp \
@@ -91,7 +91,7 @@
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ndn-cxx-android
include $(BUILD_SHARED_LIBRARY)
-include $(LOCAL_PATH_SAVED)/sqlite3/Android.mk
include $(LOCAL_PATH_SAVED)/cryptopp/Android.mk
$(call import-module,boost/1.57.0)
+$(call import-module,sqlite/3)