diff options
| author | Michael Hoisie <hoisie@google.com> | 2023-12-18 21:00:46 +0000 |
|---|---|---|
| committer | Michael Hoisie <hoisie@google.com> | 2023-12-18 21:06:49 +0000 |
| commit | 708f3ee22c9893838a4eb7a94ad2057adba733c5 (patch) | |
| tree | 61eb604ad45374b22b6c9ecdbea07ddaa853bdf7 | |
| parent | 3fcf9070e903aaf3af6bba111e2539d149dc01ac (diff) | |
| download | sqlite-708f3ee22c9893838a4eb7a94ad2057adba733c5.tar.gz | |
Make Windows variant of libsqlite consistent with Linux+Mac
Previously, the Linux and Mac variants of libsqlite were compiled with
-DSQLITE_ENABLE_ICU. The Windows variant did not include those flags.
Update the libsqlite Windows variant to include the flags.
Windows originally did not include icu because external/icu was not
enabled for host Windows, but it now builds for host Windows.
Host libsqlite is used in tools like Robolectric and LayoutLib.
Note that there is still a libsqlite_static_noicu that contains a
variant of sqlite that is not build with ICU extensions.
Test: m sqlite3 py2-launcher py3-launcher py3-launcher-autorun
Test: m traceconv trace_processor_shell
Bug: 308173442
Change-Id: Ie5f700bb1d8e960ea13cbe588d0fdd747264591f
| -rw-r--r-- | android/Android.bp | 3 | ||||
| -rw-r--r-- | dist/Android.bp | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/android/Android.bp b/android/Android.bp index a72981a..c0a5c07 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -58,6 +58,9 @@ cc_library_static { "libicuuc", ], }, + windows: { + enabled: true, + }, vendor: { cflags: ["-USQLITE_ENABLE_ICU"], exclude_shared_libs: ["libandroidicu"], diff --git a/dist/Android.bp b/dist/Android.bp index 46a7e23..023cf32 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -127,8 +127,6 @@ cc_library { static_libs: [ "liblog", ], - }, - not_windows: { shared_libs: [ "libicui18n", "libicuuc", @@ -198,10 +196,6 @@ cc_binary { "libsqlite", // sqlite3MemsysAlarm uses LOG() "liblog", - ], - }, - not_windows: { - static_libs: [ "libicui18n", "libicuuc", "libicuuc_stubdata", |