diff options
| author | Jiyong Park <jiyong@google.com> | 2017-08-18 08:42:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-18 08:42:33 +0000 |
| commit | ed6a0cb1f19290ffc824f4ccfcaeffe1effae47c (patch) | |
| tree | deaa5e2923ecc77df80d9487af179d9888dc5487 /dist/sqlite3.c | |
| parent | bf40ef59e6bedc602a2451d96355aecac28d199b (diff) | |
| parent | fc6bb5769385b88b1dd34b6465303b1a6dc54571 (diff) | |
Merge "Don't use ICU when built for vendors"
am: fc6bb57693
Change-Id: I4b95599ba8257a3fb2983eccde1e338f79046c0c
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 |