commit 92bf1727bfa297839ac65e4d4150c4b7029d31f3
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Sep 04 13:45:00 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Sep 04 14:06:27 2015 -0700
tree b115475dd97cc498921bd8ad4dd16ba71862631b
parent 45b7ad6f8e987073e9a828c3b3c049ede9dbefbf

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

app/build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index 2a2b70c..c55ce1e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -136,8 +136,14 @@
     compile 'net.named-data:jndn:0.4'
     compile 'net.named-data.jndn-xx:jndn-xx-util:0.0.1'
 
-    compile 'com.intel.jndn.utils:jndn-utils:0.9.7'
-    compile 'com.intel.jndn.management:jndn-management:0.9.7'
+    compile('com.intel.jndn.utils:jndn-utils:0.9.7') {
+      force = true
+      exclude group: 'com.intel.jndn.mock'
+    }
+    compile('com.intel.jndn.management:jndn-management:0.9.7') {
+      force = true
+      exclude group: 'com.intel.jndn.jndn-utils'
+    }
     compile 'com.google.protobuf:protobuf-java:2.6.1'
 
     compile 'joda-time:joda-time:2.7'

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 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)

app/src/main/jni/sqlite3

diff --git a/app/src/main/jni/sqlite3 b/app/src/main/jni/sqlite3
deleted file mode 160000
index b2b9ab5..0000000
--- a/app/src/main/jni/sqlite3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b2b9ab529987de81585ce6bf7bcfab91917f37af