Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disabled default compilation of sqlite + fix in build

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -26,7 +26,7 @@ BUILD_FOR_X86=1
USE_JAVAH=1 USE_JAVAH=1
LINPHONE_VIDEO=1 LINPHONE_VIDEO=1
BUILD_TLS=1 BUILD_TLS=1
BUILD_SQLITE=1 BUILD_SQLITE=0
# Checks # Checks
CHECK_MSG=$(shell ./check_tools.sh) CHECK_MSG=$(shell ./check_tools.sh)
@ -203,7 +203,7 @@ run-tests:
$(SDK_PATH)/android update test-project --path . -m ../ && \ $(SDK_PATH)/android update test-project --path . -m ../ && \
ant debug && \ ant debug && \
ant installd && \ 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: clean:
$(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS) $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS)

2
jni/Application.mk
View file

@ -1,5 +1,5 @@
APP_PROJECT_PATH := $(call my-dir)/../ 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 APP_STL := stlport_static
#sqlite #sqlite