summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2019-07-15 13:54:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-07-15 13:54:53 +0000
commit6ba0946797eba5337622132ceb10e6b45a846ee0 (patch)
tree2396f905068e0b5b3a97c837f78283f53c5908c5 /android
parentf26d1a1b9c3392f7dd0738dc2d47a889bc593672 (diff)
parent06b8c6958c5fc48e44ca0a5aaf3b0ee9eb86b5c3 (diff)
Merge "Remove all ICU integration for sqlite on host"
Diffstat (limited to 'android')
-rw-r--r--android/Android.bp9
1 files changed, 6 insertions, 3 deletions
diff --git a/android/Android.bp b/android/Android.bp
index b32bb47..70545a1 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"],