diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.bp | 2 | ||||
| -rw-r--r-- | android/sqlite3_android.cpp | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/android/Android.bp b/android/Android.bp index bbe6fed..d5a1312 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -2,6 +2,7 @@ cc_library_static { name: "libsqlite3_android", vendor_available: true, host_supported: true, + cflags: ["-DSQLITE_ENABLE_ICU"], srcs: [ "PhoneNumberUtils.cpp", "OldPhoneNumberUtils.cpp", @@ -15,6 +16,7 @@ cc_library_static { ], target: { vendor: { + cflags: ["-USQLITE_ENABLE_ICU"], exclude_shared_libs: ["libicuuc", "libicui18n"], }, }, 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> |