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

Fix transaction test: Do not use temporary files for SQLite3 on Android because it does not work

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2014-08-19 17:02:32 +02:00
parent f9d10ab387
commit e5c88aaaf5
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -435,7 +435,7 @@ prepare-cunit: $(TOPDIR)/submodules/externals/cunit/CUnit/Headers/*.h
$(TOPDIR)/res/raw/rootca.pem: $(TOPDIR)/res/raw/rootca.pem:
HTTPS_CA_DIR=$(HTTPS_CA_DIR) $(TOPDIR)/submodules/linphone/scripts/mk-ca-bundle.pl $@ HTTPS_CA_DIR=$(HTTPS_CA_DIR) $(TOPDIR)/submodules/linphone/scripts/mk-ca-bundle.pl $@
prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/res/raw/rootca.pem prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/res/raw/rootca.pem $(TOPDIR)/submodules/linphone/tester/messages.db
rm -rf liblinphone_tester/assets/config_files rm -rf liblinphone_tester/assets/config_files
mkdir -p liblinphone_tester/assets/config_files mkdir -p liblinphone_tester/assets/config_files
for file in $^; do \ for file in $^; do \

5
submodules/externals/build/sqlite/Android.mk vendored
View file

@ -4,6 +4,11 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
sqlite3.c sqlite3.c
# Android does not provide a way to create temporary files which are needed
# for transactions... so we work in memory only
# see http://www.sqlite.org/compile.html#temp_store
LOCAL_CFLAGS += -DSQLITE_TEMP_STORE=3
LOCAL_MODULE:= liblinsqlite LOCAL_MODULE:= liblinsqlite
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
submodules/linphone

@ -1 +1 @@
Subproject commit c53f70e256c464fef9dc3eea88583ffdc069fc10 Subproject commit c8bd7e1007c466d5f244c0e82e8d8e5ebb563c2f