diff options
| author | Neil Fuller <nfuller@google.com> | 2019-07-15 07:10:49 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-15 07:10:49 -0700 |
| commit | 91b267d05b97a047789e170743f6dcf42d072eb3 (patch) | |
| tree | 20a18fc6da289a4c797f5eb2f8b54cf2d73271a8 | |
| parent | 7ef102eeee3381f7bb3369f6bf729163ced674aa (diff) | |
| parent | 6ba0946797eba5337622132ceb10e6b45a846ee0 (diff) | |
Merge "Remove all ICU integration for sqlite on host"
am: 6ba0946797
Change-Id: I5bddf8d087d0464f41140cabdedb58e8ff52a4cf
| -rw-r--r-- | android/Android.bp | 9 | ||||
| -rw-r--r-- | dist/Android.bp | 9 |
2 files changed, 7 insertions, 11 deletions
diff --git a/android/Android.bp b/android/Android.bp index 3ff870e..0cccef1 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -1,10 +1,8 @@ cc_library_static { name: "libsqlite3_android", vendor_available: true, - host_supported: true, native_bridge_supported: true, cflags: [ - "-DSQLITE_ENABLE_ICU", "-Wall", "-Werror", "-Wno-unused-function", @@ -18,9 +16,14 @@ cc_library_static { include_dirs: ["external/sqlite/dist"], shared_libs: [ "liblog", - "libandroidicu", ], target: { + android: { + cflags: ["-DSQLITE_ENABLE_ICU"], + shared_libs: [ + "libandroidicu", + ], + }, vendor: { cflags: ["-USQLITE_ENABLE_ICU"], exclude_shared_libs: ["libandroidicu"], diff --git a/dist/Android.bp b/dist/Android.bp index fa46db3..3a6aeea 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -98,20 +98,13 @@ cc_library { "libutils", ], }, - not_windows: { - shared_libs: [ - "libandroidicu", - ], - - // include android specific methods - whole_static_libs: ["libsqlite3_android"], - }, windows: { enabled: true, }, vendor: { cflags: ["-USQLITE_ENABLE_ICU"], exclude_shared_libs: ["libandroidicu"], + exclude_static_libs: ["libsqlite3_android"], }, }, |