diff options
| author | Jiyong Park <jiyong@google.com> | 2017-09-08 03:24:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-08 03:24:00 +0000 |
| commit | 90de50e46c20912eabbc772ef9ec7c7d035c4e57 (patch) | |
| tree | 3e9d7bd2d38daff62d319c5b8c89bf41a5309c73 /dist/sqlite3.c | |
| parent | 00a6f84c92f3a7ba119c16d9d2df16216d124330 (diff) | |
| parent | 4d17a2b346307775b70b856cc14b631df2a0f4b6 (diff) | |
Merge "ICU is disabled by Android.bp" am: 5ed153d271
am: 4d17a2b346
Change-Id: I65d2b6e8e176ebccb898fd09ff8d143a7dc2803c
Diffstat (limited to 'dist/sqlite3.c')
| -rw-r--r-- | dist/sqlite3.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/dist/sqlite3.c b/dist/sqlite3.c index a1be12b..9db21a8 100644 --- a/dist/sqlite3.c +++ b/dist/sqlite3.c @@ -84,15 +84,6 @@ #endif /* -** When sqlite is built for the VNDK, ICU is disabled because -** libicuuc.so and libicui18n.so aren't available then. -** TODO(b/64514237): move this to Android.bp -*/ -#ifdef __ANDROID_VNDK__ -#undef SQLITE_ENABLE_ICU -#endif - -/* ** Include the header file used to customize the compiler options for MSVC. ** This should be done first so that it can successfully prevent spurious ** compiler warnings due to subsequent content in this file and other files |