Disabled default compilation of sqlite + fix in build

This commit is contained in:
Sylvain Berfini 2013-08-14 16:37:24 +02:00
parent e31b0670bd
commit ed3626790a
2 changed files with 3 additions and 3 deletions

View file

@ -26,7 +26,7 @@ BUILD_FOR_X86=1
USE_JAVAH=1
LINPHONE_VIDEO=1
BUILD_TLS=1
BUILD_SQLITE=1
BUILD_SQLITE=0
# Checks
CHECK_MSG=$(shell ./check_tools.sh)
@ -203,7 +203,7 @@ run-tests:
$(SDK_PATH)/android update test-project --path . -m ../ && \
ant debug && \
ant installd && \
adb shell am instrument -w -e size small org.linphone.test/android.test.InstrumentationTestRunner
adb shell am instrument -w -e size large org.linphone.test/android.test.InstrumentationTestRunner
clean:
$(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS)

View file

@ -1,5 +1,5 @@
APP_PROJECT_PATH := $(call my-dir)/../
APP_MODULES :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon liblpxml2 liblinsqlite
APP_MODULES :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon liblpxml2
APP_STL := stlport_static
#sqlite