Skip to content

Fix build of sqlcipher to work together with ICU (Unicode) lib #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2014
Merged

Fix build of sqlcipher to work together with ICU (Unicode) lib #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions external/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down