diff options
| author | Michael Hoisie <hoisie@google.com> | 2023-12-27 00:32:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-27 00:32:19 +0000 |
| commit | 50a4f167dff56a71594eacd363a74f097c5fba55 (patch) | |
| tree | 61eb604ad45374b22b6c9ecdbea07ddaa853bdf7 | |
| parent | cc56d0869ea957450a3f193f2d7bfd629eea78cb (diff) | |
| parent | cc6929369e1eea8e183dffa33179f29630a81545 (diff) | |
| download | sqlite-50a4f167dff56a71594eacd363a74f097c5fba55.tar.gz | |
Merge "Make Windows variant of libsqlite consistent with Linux+Mac" into main am: cc6929369e
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2881267
Change-Id: I837082638720cb73852bc9ceb775ec638fb729cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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", |