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

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

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

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}

Patch Set 1 #

Patch Set 2 : Original version of CL #

Patch Set 3 : First reland of CL #

Patch Set 4 : Back to final CL to land. #

Total comments: 6

Patch Set 5 : Comment use of group. #

Patch Set 6 : rebase #

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

Messages

Total messages: 22 (5 generated)
Scott Hess - ex-Googler
Original version of CL
5 years, 3 months ago (2015-08-31 19:46:23 UTC) #1
Scott Hess - ex-Googler
First reland of CL
5 years, 3 months ago (2015-08-31 20:08:53 UTC) #2
Scott Hess - ex-Googler
Back to final CL to land.
5 years, 3 months ago (2015-08-31 20:11:43 UTC) #3
Scott Hess - ex-Googler
OK, last try is for all the beans. Consulted Brett about how to manage the ...
5 years, 3 months ago (2015-08-31 20:17:54 UTC) #5
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1306863006/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1306863006/60001
5 years, 3 months ago (2015-08-31 20:19:10 UTC) #7
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: android_chromium_gn_compile_rel on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromium_gn_compile_rel/builds/126749)
5 years, 3 months ago (2015-08-31 20:47:05 UTC) #9
brettw
All The Beans LGTM https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn File third_party/sqlite/BUILD.gn (right): https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn#newcode16 third_party/sqlite/BUILD.gn:16: include_dirs = [ "." ] ...
5 years, 3 months ago (2015-08-31 20:56:59 UTC) #10
Scott Hess - ex-Googler
Thanks for looking at it... https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn File third_party/sqlite/BUILD.gn (right): https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn#newcode16 third_party/sqlite/BUILD.gn:16: include_dirs = [ "." ...
5 years, 3 months ago (2015-08-31 21:06:49 UTC) #11
Scott Hess - ex-Googler
Comment use of group.
5 years, 3 months ago (2015-08-31 21:06:59 UTC) #12
brettw
https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn File third_party/sqlite/BUILD.gn (right): https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn#newcode16 third_party/sqlite/BUILD.gn:16: include_dirs = [ "." ] Can you do that ...
5 years, 3 months ago (2015-08-31 21:11:05 UTC) #13
Scott Hess - ex-Googler
https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn File third_party/sqlite/BUILD.gn (right): https://codereview.chromium.org/1306863006/diff/60001/third_party/sqlite/BUILD.gn#newcode16 third_party/sqlite/BUILD.gn:16: include_dirs = [ "." ] On 2015/08/31 21:11:05, brettw ...
5 years, 3 months ago (2015-08-31 21:15:59 UTC) #14
Scott Hess - ex-Googler
rebase
5 years, 3 months ago (2015-08-31 22:29:29 UTC) #15
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1306863006/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1306863006/100001
5 years, 3 months ago (2015-08-31 23:11:59 UTC) #18
Scott Hess - ex-Googler
Sheriff: Previous iterations of this change caused issues with the gn bots in the gn ...
5 years, 3 months ago (2015-08-31 23:13:28 UTC) #19
commit-bot: I haz the power
Committed patchset #6 (id:100001)
5 years, 3 months ago (2015-09-01 00:31:00 UTC) #20
commit-bot: I haz the power
Patchset 6 (id:??) landed as https://crrev.com/f71db5c36625ff00feb8283028631303ae5caa7c Cr-Commit-Position: refs/heads/master@{#346536}
5 years, 3 months ago (2015-09-01 00:31:35 UTC) #21
Paweł Hajdan Jr.
5 years, 3 months ago (2015-09-01 10:19:37 UTC) #22
Message was sent while issue was closed.
A revert of this CL (patchset #6 id:100001) has been created in
https://codereview.chromium.org/1325833003/ by phajdan.jr@chromium.org.

The reason for reverting is: 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.

Powered by Google App Engine
This is Rietveld 408576698