diff options
| author | Jiyong Park <jiyong@google.com> | 2017-08-10 13:48:35 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-08-11 23:08:29 +0900 |
| commit | 633397eeef296584d3242d8a72790dcf11bb36fd (patch) | |
| tree | 7233a8dc40446078be96d8a082788c98c5f1d6ef /android | |
| parent | b4076dfd66f114263a1f70cf3ba73c2d55ccb3b0 (diff) | |
ICU is disabled by Android.bp
By using vendor.cflags, SQLITE_ENABLE_ICU is on/off from Android.bp. No
need to def/undef it inside the source code.
Bug: 64514237
Test: BOARD_VNDK_VERSION=current m -j libsqlite libsqlite.vendor
Change-Id: If9771fa020e528445275281017e424a5bbc2ae99
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> |