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

Issue 1325833003: Revert of [sqlite] Respect the gyp and gn component switch. (Closed)

Created:
5 years, 3 months ago by Paweł Hajdan Jr.
Modified:
5 years, 3 months ago
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of [sqlite] Respect the gyp and gn component switch. (patchset #6 id:100001 of https://codereview.chromium.org/1306863006/ ) Reason for revert: Suspected of breaking chromium.webkit Mac builders, see https://code.google.com/p/chromium/issues/detail?id=526208 Summary: Incompatible library version: httpd requires version 9.0.0 or later, but libsqlite3.dylib provides version 0.0.0 /b/build/slave/WebKit_Mac10_6__dbg_/build/src/out/Debug/libsqlite3.dylib seems to be used instead of expected/intended /usr/lib/libsqlite3.dylib 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. > > [Relanding https://codereview.chromium.org/1322463002/ ] > > BUG=489444 > TBR=michaeln@chromium.org, thakis@chromium.org, brettw@chromium.org > > Committed: https://crrev.com/f71db5c36625ff00feb8283028631303ae5caa7c > Cr-Commit-Position: refs/heads/master@{#346536} TBR=michaeln@chromium.org,thakis@chromium.org,brettw@chromium.org,shess@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=489444 Committed: https://crrev.com/9d8aca4a2a7b59dbc8554186739987fb4bc2b400 Cr-Commit-Position: refs/heads/master@{#346615}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+82 lines, -45 lines) Patch
M sql/BUILD.gn View 1 chunk +2 lines, -0 lines 0 comments Download
M sql/connection_unittest.cc View 3 chunks +7 lines, -6 lines 0 comments Download
A sql/proxy.h View 1 chunk +39 lines, -0 lines 0 comments Download
A sql/proxy.cc View 1 chunk +28 lines, -0 lines 0 comments Download
M sql/sql.gyp View 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/sqlite/BUILD.gn View 5 chunks +3 lines, -28 lines 0 comments Download
M third_party/sqlite/sqlite.gyp View 3 chunks +1 line, -11 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
Paweł Hajdan Jr.
Created Revert of [sqlite] Respect the gyp and gn component switch.
5 years, 3 months ago (2015-09-01 10:19:37 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1325833003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1325833003/1
5 years, 3 months ago (2015-09-01 10:19:51 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 3 months ago (2015-09-01 10:20:31 UTC) #3
commit-bot: I haz the power
5 years, 3 months ago (2015-09-01 10:21:22 UTC) #4
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/9d8aca4a2a7b59dbc8554186739987fb4bc2b400
Cr-Commit-Position: refs/heads/master@{#346615}

Powered by Google App Engine
This is Rietveld 408576698