diff options
| author | phajdan.jr <phajdan.jr@chromium.org> | 2015-09-01 03:20:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-01 10:21:13 +0000 |
| commit | 9d8aca4a2a7b59dbc8554186739987fb4bc2b400 (patch) | |
| tree | 22974d9e84978ddc276addad5671bbbea2a51abd /sql/connection_unittest.cc | |
| parent | 48d200a503e735488eaf40cc7d58a63e53ea878e (diff) | |
| download | chromium_src-9d8aca4a2a7b59dbc8554186739987fb4bc2b400.zip chromium_src-9d8aca4a2a7b59dbc8554186739987fb4bc2b400.tar.gz chromium_src-9d8aca4a2a7b59dbc8554186739987fb4bc2b400.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1325833003
Cr-Commit-Position: refs/heads/master@{#346615}
Diffstat (limited to 'sql/connection_unittest.cc')
| -rw-r--r-- | sql/connection_unittest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc index aa9dbeb..df35dd1 100644 --- a/sql/connection_unittest.cc +++ b/sql/connection_unittest.cc @@ -12,6 +12,7 @@ #include "sql/connection.h" #include "sql/correct_sql_test_base.h" #include "sql/meta_table.h" +#include "sql/proxy.h" #include "sql/statement.h" #include "sql/test/error_callback_support.h" #include "sql/test/scoped_error_ignorer.h" @@ -85,12 +86,12 @@ class ScopedScalarFunction { int args, base::Callback<void(sqlite3_context*,int,sqlite3_value**)> cb) : db_(db.db_), function_name_(function_name), cb_(cb) { - ::sqlite3_create_function_v2(db_, function_name, args, SQLITE_UTF8, - this, &Run, NULL, NULL, NULL); + sql::sqlite3_create_function_v2(db_, function_name, args, SQLITE_UTF8, + this, &Run, NULL, NULL, NULL); } ~ScopedScalarFunction() { - ::sqlite3_create_function_v2(db_, function_name_, 0, SQLITE_UTF8, - NULL, NULL, NULL, NULL, NULL); + sql::sqlite3_create_function_v2(db_, function_name_, 0, SQLITE_UTF8, + NULL, NULL, NULL, NULL, NULL); } private: @@ -114,10 +115,10 @@ class ScopedCommitHook { base::Callback<int(void)> cb) : db_(db.db_), cb_(cb) { - ::sqlite3_commit_hook(db_, &Run, this); + sql::sqlite3_commit_hook(db_, &Run, this); } ~ScopedCommitHook() { - ::sqlite3_commit_hook(db_, NULL, NULL); + sql::sqlite3_commit_hook(db_, NULL, NULL); } private: |