Upstream sqlite gyp changes for Android.

third_party/sqlite/sqlite.gyp

Index: third_party/sqlite/sqlite.gyp
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 63aea03e525fe93bd702283ba9f630c7183e3ddd..cf9ce3bb9a8e73d4db17f3ee07a459395765a1ca 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -34,11 +34,6 @@
                 ],
           },
         ],
-        ['OS == "android"', {
-          'defines': [
-            'SQLITE_TEMP_STORE=3',
-          ],
-        }],
         ['use_system_sqlite', {
           'type': 'none',
           'direct_dependent_settings': {
@@ -55,7 +50,7 @@
                 ],
               },
             }],
-            ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+            ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
               'direct_dependent_settings': {
                 'cflags': [
                   # This next command produces no output but it it will fail
@@ -128,7 +123,17 @@
                 ],
               },
             }],
-            ['os_posix == 1 and OS != "mac"', {
+            ['OS == "android"', {
+              'defines': [
+                'HAVE_USLEEP=1',
+                'SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576',
+                'SQLITE_DEFAULT_AUTOVACUUM=1',
+                'SQLITE_TEMP_STORE=3',
+                'SQLITE_ENABLE_FTS3_BACKWARDS',
+                'DSQLITE_DEFAULT_FILE_FORMAT=4',
+              ],
+            }],
+            ['os_posix == 1 and OS != "mac" and OS != "android"', {
               'cflags': [
                 # SQLite doesn't believe in compiler warnings,
                 # preferring testing.
@@ -157,7 +162,7 @@
     },
   ],
   'conditions': [
-    ['os_posix == 1 and OS != "mac" and OS != "ios" and not use_system_sqlite', {
+    ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', {
       'targets': [
         {
           'target_name': 'sqlite_shell',