diff options
| author | tsergeant <tsergeant@chromium.org> | 2016-03-09 18:27:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 02:29:52 +0000 |
| commit | fb9ae22304e7322598f0d9518015f9b5508d1466 (patch) | |
| tree | 64202042d04841b04000f3b0c3f007c78ba6f0d2 /sql/sql.gyp | |
| parent | 153adf5d846b2c7da69b426ba14e4b140f8888be (diff) | |
| download | chromium_src-fb9ae22304e7322598f0d9518015f9b5508d1466.zip chromium_src-fb9ae22304e7322598f0d9518015f9b5508d1466.tar.gz chromium_src-fb9ae22304e7322598f0d9518015f9b5508d1466.tar.bz2 | |
Revert of [sqlite] sql::Recovery working under USE_SYSTEM_SQLITE. (patchset #2 id:20001 of https://codereview.chromium.org/1782633002/ )
Reason for revert:
Causing compile failures on iOS:
https://build.chromium.org/p/chromium.mac/builders/iOS_Simulator_GN_%28dbg%29/builds/2931
https://build.chromium.org/p/chromium.mac/builders/iOS_Device_GN/builds/2630
Original issue's description:
> [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/1757653002/ ]
>
> BUG=584407
> TBR=sdefresne@chromium.org
>
> Committed: https://crrev.com/81bdd5bca887096575be7d13127095ed56b3d3c4
> Cr-Commit-Position: refs/heads/master@{#380287}
TBR=sdefresne@chromium.org,shess@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=584407
Review URL: https://codereview.chromium.org/1781973002
Cr-Commit-Position: refs/heads/master@{#380311}
Diffstat (limited to 'sql/sql.gyp')
| -rw-r--r-- | sql/sql.gyp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp index cde3057..30bd76d 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -114,18 +114,6 @@ '../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, ], |