diff options
| author | Michael Hoisie <hoisie@google.com> | 2023-12-27 15:58:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-27 15:58:55 +0000 |
| commit | 9f53facf2e326ac47013fd195363d68479305e35 (patch) | |
| tree | e2b2ad4b3d22cfd7a00221b9b61f6049c5bc386c | |
| parent | 33649425dee20075b8753371d9be2d26f8c328d7 (diff) | |
| parent | 410dc61ac31dfa89e3b6981055ef356483627e46 (diff) | |
| download | sqlite-android12-hostruntime-dev.tar.gz | |
Merge "Enable host Windows build for libsqlite and libsqlite3_android" into android12-hostruntime-devandroid12-hostruntime-dev
| -rw-r--r-- | android/Android.bp | 3 | ||||
| -rw-r--r-- | dist/Android.bp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/android/Android.bp b/android/Android.bp index 3c32bdd..eba950e 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -56,6 +56,9 @@ cc_library_static { cflags: ["-USQLITE_ENABLE_ICU"], exclude_shared_libs: ["libandroidicu"], }, + windows: { + enabled: true, + }, }, export_include_dirs: ["."], } diff --git a/dist/Android.bp b/dist/Android.bp index 4d5b2b6..b515242 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -123,18 +123,14 @@ cc_library { whole_static_libs: ["libsqlite3_android"], }, host: { - static_libs: [ + static_libs: [ "liblog", ], - cflags: ["-DSQLITE_ENABLE_ICU"], - }, - not_windows: { shared_libs: [ "libicui18n", "libicuuc", ], - - // include android specific methods + cflags: ["-DSQLITE_ENABLE_ICU"], whole_static_libs: ["libsqlite3_android"], }, windows: { |