From 2d227295c70364387a99b80f526737b261c9fae8 Mon Sep 17 00:00:00 2001 From: Chris Brody Date: Mon, 14 Jul 2014 21:12:34 +0200 Subject: [PATCH] Fix build of sqlcipher to work together with ICU (Unicode) lib --- external/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/Android.mk b/external/Android.mk index 2ad772fe..3aa323df 100644 --- a/external/Android.mk +++ b/external/Android.mk @@ -37,13 +37,13 @@ android_sqlite_cflags := -DHAVE_USLEEP=1 \ sqlcipher_files := \ sqlcipher/sqlite3.c -sqlcipher_cflags := -DSQLITE_HAS_CODEC -DHAVE_FDATASYNC=0 -Dfdatasync=fsync +sqlcipher_cflags := -DSQLITE_HAS_CODEC -DHAVE_FDATASYNC=0 -Dfdatasync=fsync -DSQLITE_ENABLE_ICU include $(CLEAR_VARS) LOCAL_STATIC_LIBRARIES += static-libcrypto LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlcipher_cflags) -LOCAL_C_INCLUDES := includes sqlcipher +LOCAL_C_INCLUDES := includes sqlcipher icu4c/common icu4c/i18n LOCAL_LDFLAGS += $(project_ldflags) LOCAL_MODULE := libsqlcipher LOCAL_SRC_FILES := $(sqlcipher_files)