Upstream sqlite gyp changes for Android.

third_party/sqlite/sqlite.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'use_system_sqlite%': 0,
     'required_sqlite_version': '3.6.1',
   },
   'target_defaults': {
@@ skipping 16 matching lines @@
         [ 'chromeos==1' , {
             'defines': [
                 # Despite obvious warnings about not using this flag
                 # in deployment, we are turning off sync in ChromeOS
                 # and relying on the underlying journaling filesystem
                 # to do error recovery properly.  It's much faster.
                 'SQLITE_NO_SYNC',
                 ],
           },
         ],
-        ['OS == "android"', {
-          'defines': [
-            'SQLITE_TEMP_STORE=3',
-          ],
-        }],
         ['use_system_sqlite', {
           'type': 'none',
           'direct_dependent_settings': {
             'defines': [
               'USE_SYSTEM_SQLITE',
             ],
           },
 
           'conditions': [
             ['OS == "ios"', {
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/usr/lib/libsqlite3.dylib',
                 ],
               },
             }],
-            ['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
                   # (and cause GYP to fail) if we don't have a recent enough
                   # version of sqlite.
                   '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlite3)',
 
                   '<!@(pkg-config --cflags sqlite3)',
                 ],
               },
@@ skipping 52 matching lines @@
             4018, 4244,
           ],
           'conditions': [
             ['OS=="linux"', {
               'link_settings': {
                 'libraries': [
                   '-ldl',
                 ],
               },
             }],
-            ['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',

[andreip3000, 2012/08/01 11:46:06]

Should we match the flags that Android uses?

https://android.googlesource.com/platform/external/sqlite/+/2d758ba484351cd86...

I remember that was our intention originally but I think we diverged over time.

One notable setting is powersave overwrite which was enabled in this change:

https://android.googlesource.com/platform/external/sqlite/+/2d758ba484351cd86...

Looking at the SQLite documentation, it seems the default is 'on' anyway.
However, maybe it's better to be explicit about it too (like Android is).

[Yaron, 2012/08/04 01:14:43]

I took the set that we had previously and just removed redundant ones (from the
shared block on L12 above) 

+              ],
+            }],
+            ['os_posix == 1 and OS != "mac" and OS != "android"', {
               'cflags': [
                 # SQLite doesn't believe in compiler warnings,
                 # preferring testing.
                 #   http://www.sqlite.org/faq.html#q17
                 '-Wno-int-to-pointer-cast',
                 '-Wno-pointer-to-int-cast',
               ],
             }],
             ['clang==1', {
               'xcode_settings': {
                 'WARNING_CFLAGS': [
                   # sqlite does `if (*a++ && *b++);` in a non-buggy way.
                   '-Wno-empty-body',
                   # sqlite has some `unsigned < 0` checks.
                   '-Wno-tautological-compare',
                 ],
               },
               'cflags': [
                 '-Wno-empty-body',
                 '-Wno-tautological-compare',
               ],
             }],
           ],
         }],
       ],
     },
   ],
   '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',
           'type': 'executable',
           'dependencies': [
             '../icu/icu.gyp:icuuc',
             'sqlite',
           ],
           'sources': [
             'src/src/shell.c',
             'src/src/shell_icu_linux.c',
           ],
           'link_settings': {
             'link_languages': ['c++'],
           },
         },
       ],
     },]
   ],
 }