summaryrefslogtreecommitdiff
path: root/android/sqlite3_android.cpp
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2017-09-08 03:24:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-08 03:24:00 +0000
commit90de50e46c20912eabbc772ef9ec7c7d035c4e57 (patch)
tree3e9d7bd2d38daff62d319c5b8c89bf41a5309c73 /android/sqlite3_android.cpp
parent00a6f84c92f3a7ba119c16d9d2df16216d124330 (diff)
parent4d17a2b346307775b70b856cc14b631df2a0f4b6 (diff)
Merge "ICU is disabled by Android.bp" am: 5ed153d271
am: 4d17a2b346 Change-Id: I65d2b6e8e176ebccb898fd09ff8d143a7dc2803c
Diffstat (limited to 'android/sqlite3_android.cpp')
-rw-r--r--android/sqlite3_android.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp
index da40647..659ee6c 100644
--- a/android/sqlite3_android.cpp
+++ b/android/sqlite3_android.cpp
@@ -21,13 +21,6 @@
#include <string.h>
#include <unistd.h>
-// ICU is turned off when sqlite is built for VNDK
-#ifndef __ANDROID_VNDK__
-#define SQLITE_ENABLE_ICU
-#else
-#undef SQLITE_ENABLE_ICU
-#endif
-
#ifdef SQLITE_ENABLE_ICU
#include <unicode/ucol.h>
#include <unicode/uiter.h>