Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Issue 1748183004: [sqlite] Remove recover.c from amalgamation. (Closed)

Created:
4 years, 9 months ago by Scott Hess - ex-Googler
Modified:
4 years, 9 months ago
Reviewers:
sdefresne
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@zzzzsql_ios_recover_review0
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

[sqlite] Remove recover.c from amalgamation. Build recover.c as a separate object file from SQLite core. Preparing for building it with system SQLite for systems which don't use Chromium's SQLite. BUG=584407 Committed: https://crrev.com/ce1818cc897f79189865e3a5daf022abf54e8aae Cr-Commit-Position: refs/heads/master@{#379954}

Patch Set 1 #

Total comments: 6

Patch Set 2 : Rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+31 lines, -2548 lines) Patch
M sql/recovery.cc View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/sqlite/BUILD.gn View 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/sqlite/amalgamation/sqlite3.h View 1 chunk +0 lines, -16 lines 0 comments Download
M third_party/sqlite/amalgamation/sqlite3.c View 1 2 chunks +0 lines, -2508 lines 0 comments Download
M third_party/sqlite/sqlite.gyp View 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/sqlite/src/Makefile.in View 1 chunk +0 lines, -2 lines 0 comments Download
M third_party/sqlite/src/main.mk View 1 chunk +0 lines, -2 lines 0 comments Download
A third_party/sqlite/src/src/recover.h View 1 chunk +23 lines, -0 lines 0 comments Download
M third_party/sqlite/src/src/recover.c View 1 chunk +1 line, -1 line 0 comments Download
M third_party/sqlite/src/src/sqlite.h.in View 1 chunk +0 lines, -16 lines 0 comments Download
M third_party/sqlite/src/tool/mksqlite3c.tcl View 1 chunk +0 lines, -3 lines 0 comments Download

Depends on Patchset:

Messages

Total messages: 16 (6 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1748183004/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1748183004/1
4 years, 9 months ago (2016-03-01 23:49:46 UTC) #2
Scott Hess - ex-Googler
Annotating for reviewer. https://codereview.chromium.org/1748183004/diff/1/sql/recovery.cc File sql/recovery.cc (right): https://codereview.chromium.org/1748183004/diff/1/sql/recovery.cc#newcode19 sql/recovery.cc:19: #include "third_party/sqlite/src/src/recover.h" I originally had third_party/sqlite/sqlite3.h ...
4 years, 9 months ago (2016-03-02 01:17:37 UTC) #3
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 9 months ago (2016-03-02 02:03:19 UTC) #5
Scott Hess - ex-Googler
Thanks for volunteering! Let me know if you have questions.
4 years, 9 months ago (2016-03-02 18:44:18 UTC) #7
sdefresne
lgtm
4 years, 9 months ago (2016-03-08 15:47:44 UTC) #8
Scott Hess - ex-Googler
Rebase
4 years, 9 months ago (2016-03-08 21:23:01 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1748183004/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1748183004/20001
4 years, 9 months ago (2016-03-08 21:24:03 UTC) #12
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 9 months ago (2016-03-08 23:03:15 UTC) #13
commit-bot: I haz the power
Patchset 2 (id:??) landed as https://crrev.com/ce1818cc897f79189865e3a5daf022abf54e8aae Cr-Commit-Position: refs/heads/master@{#379954}
4 years, 9 months ago (2016-03-08 23:04:43 UTC) #15
Scott Hess - ex-Googler
4 years, 9 months ago (2016-03-09 06:33:16 UTC) #16
Message was sent while issue was closed.
https://codereview.chromium.org/1748183004/diff/1/sql/recovery.cc
File sql/recovery.cc (right):

https://codereview.chromium.org/1748183004/diff/1/sql/recovery.cc#newcode19
sql/recovery.cc:19: #include "third_party/sqlite/src/src/recover.h"
On 2016/03/02 01:17:37, Scott Hess wrote:
> I originally had third_party/sqlite/sqlite3.h include recover.h, but I found
> that on Linux it just didn't work.  I don't know why.  I'd prefer to circle
back
> around after landing the series, because I also found I couldn't really test
> USE_SYSTEM_SQLITE on Linux (possibly because of sysroot?).

Looks like I get to figure it out now, since other includes of this sort broke
the build (but not the commit queue) when landing
https://codereview.chromium.org/1757653002/ ...

Powered by Google App Engine
This is Rietveld 408576698