diff options
| author | shess <shess@chromium.org> | 2016-03-11 11:38:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 19:41:36 +0000 |
| commit | b9606f86f7058774ba846c8f9cc8735deb251f0c (patch) | |
| tree | c0b9d2d2898fcf6c62574674f13df1bcfa39b001 /sql/sql.gyp | |
| parent | 4a8943a3f2bcb06115d9c82fd5158ccba07186a2 (diff) | |
| download | chromium_src-b9606f86f7058774ba846c8f9cc8735deb251f0c.zip chromium_src-b9606f86f7058774ba846c8f9cc8735deb251f0c.tar.gz chromium_src-b9606f86f7058774ba846c8f9cc8735deb251f0c.tar.bz2 | |
[sqlite] sql::Recovery working under USE_SYSTEM_SQLITE.
Removes the USE_SYSTEM_SQLITE conditional sections in sql::Recover
implementation and tests. third_party/sqlite includes sqlite_recover
library for the USE_SYSTEM_SQLITE case, with recover.c compiled against
the system version of SQLite.
Additionally remove interiorCursorEOF() from recover.c, as it was
unused, rather than adding a compile flag to allow it.
[Relands https://codereview.chromium.org/1782633002/ which
relanded https://codereview.chromium.org/1757653002/ ]
BUG=584407
TBR=sdefresne@chromium.org
Review URL: https://codereview.chromium.org/1785443004
Cr-Commit-Position: refs/heads/master@{#380703}
Diffstat (limited to 'sql/sql.gyp')
| -rw-r--r-- | sql/sql.gyp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp index 30bd76d..cde3057 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -114,6 +114,18 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], + ['OS == "ios"', { + 'actions': [{ + 'action_name': 'copy_test_data', + 'variables': { + 'test_data_files': [ + 'test/data', + ], + 'test_data_prefix' : 'sql', + }, + 'includes': [ '../build/copy_test_data_ios.gypi' ], + }], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], |