diff options
| author | Jiyong Park <jiyong@google.com> | 2017-08-09 20:15:42 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-08-10 20:42:59 +0900 |
| commit | 58d1be38f60cfe427d2dddea2ecdba52eeb4485f (patch) | |
| tree | deaa5e2923ecc77df80d9487af179d9888dc5487 /dist/sqlite3.c | |
| parent | 39a32b46137c57b816e71d73438e4fac69b6b9d6 (diff) | |
Don't use ICU when built for vendors
libicuuc.so isn't available for vendors, thus ICU is turned off when
libsqlite is built for vendors.
Bug: 64104535
Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor
Merged-In: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4
Change-Id: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4
(cherry picked from commit b4076dfd66f114263a1f70cf3ba73c2d55ccb3b0)
Diffstat (limited to 'dist/sqlite3.c')
| -rw-r--r-- | dist/sqlite3.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dist/sqlite3.c b/dist/sqlite3.c index 9db21a8..a1be12b 100644 --- a/dist/sqlite3.c +++ b/dist/sqlite3.c @@ -84,6 +84,15 @@ #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 |