diff options
| author | sergeyv <sergeyv@chromium.org> | 2015-08-28 10:48:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-28 17:48:39 +0000 |
| commit | b5feb9e34aae49aff54212f4848a8cb51b3537e0 (patch) | |
| tree | 5056e6423d2439c373f2a78a1826d0978b42eebb /sql/BUILD.gn | |
| parent | 6959ac71127b65bb39522cd5fb54db5eb83fe20b (diff) | |
| download | chromium_src-b5feb9e34aae49aff54212f4848a8cb51b3537e0.zip chromium_src-b5feb9e34aae49aff54212f4848a8cb51b3537e0.tar.gz chromium_src-b5feb9e34aae49aff54212f4848a8cb51b3537e0.tar.bz2 | |
Revert of [sqlite] Respect the gyp and gn component switch. (patchset #1 id:1 of https://codereview.chromium.org/1322463002/ )
Reason for revert:
Broken build on the Builder: Win x64 GN (dbg).
Failure example: http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/8549
Original issue's description:
> [sqlite] Respect the gyp and gn component switch.
>
> SQLITE_API is the existing mechanism SQLite provides, and is used in
> preference to inventing a new SQLITE_EXPORT symbol (like
> sql/sql_export.h and other examples).
>
> CoreServices.framework is necessary on OSX because of the Time Machine
> patch.
>
> Remove sql/proxy.{h,cc}, which was necessary to work around SQLite
> linking statically into both component shlibs and unit test executables.
>
> BUG=489444
>
> Committed: https://crrev.com/4ec68d9ad2d3e0c74967a17946c8bf7ed4450f73
> Cr-Commit-Position: refs/heads/master@{#346151}
TBR=michaeln@chromium.org,shess@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=489444
Review URL: https://codereview.chromium.org/1324523004
Cr-Commit-Position: refs/heads/master@{#346179}
Diffstat (limited to 'sql/BUILD.gn')
| -rw-r--r-- | sql/BUILD.gn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/BUILD.gn b/sql/BUILD.gn index 57f1b38..38f85b4 100644 --- a/sql/BUILD.gn +++ b/sql/BUILD.gn @@ -13,6 +13,8 @@ component("sql") { "init_status.h", "meta_table.cc", "meta_table.h", + "proxy.cc", + "proxy.h", "recovery.cc", "recovery.h", "statement.cc", |