commit 1c54a19a066e015947d2dc0d31761a0edaaa15e7
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 15 14:42:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 15 14:42:05 2019 +0000
tree 216e1e2cde7497a4cdbd374c147ce6d4e746f555
parent 6ba0946797eba5337622132ceb10e6b45a846ee0
parent 5ce0a4ddfda88ae43e556ae27e627a312155e3d6

Merge "libsqlite: remove unused deps"

android/Android.bp

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 @@
     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"],

dist/Android.bp

diff --git a/dist/Android.bp b/dist/Android.bp
index 7a3c94a..414c84d 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -96,20 +96,13 @@
                 "liblog",
             ],
         },
-        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"],
         },
     },