From ed3626790ae74d15872627bc1630375744264728 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 14 Aug 2013 16:37:24 +0200 Subject: [PATCH] Disabled default compilation of sqlite + fix in build --- Makefile | 4 ++-- jni/Application.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ab7a75fd1..75cb87949 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/jni/Application.mk b/jni/Application.mk index ceb1024cc..3659d8c07 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -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