diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 19:22:42 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 19:22:42 +0000 |
| commit | 69c5845f97c6c3710aa154ae0f81dfc40c14ea66 (patch) | |
| tree | 6e19280706fa03efb9bb1b76ee9f5feb1a6d1620 /third_party/sqlite | |
| parent | bba7b45fd533c0a2c772593ff6943c5c87407865 (diff) | |
| download | chromium_src-69c5845f97c6c3710aa154ae0f81dfc40c14ea66.zip chromium_src-69c5845f97c6c3710aa154ae0f81dfc40c14ea66.tar.gz chromium_src-69c5845f97c6c3710aa154ae0f81dfc40c14ea66.tar.bz2 | |
Upstream sqlite gyp changes for Android.
Includes a change to sql/Connection to propagate the auto_vacuum pragma across a raze operation. Also updates test expectations.
BUG=137853
Review URL: https://chromiumcodereview.appspot.com/10829062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite')
| -rw-r--r-- | third_party/sqlite/sqlite.gyp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index 63aea03..cf9ce3b 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', |