summaryrefslogtreecommitdiffstats
path: root/sql/sql.gyp
diff options
context:
space:
mode:
authorshess <shess@chromium.org>2015-08-28 12:39:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-28 19:39:56 +0000
commit02ce712af589a5b722ebbf5c2fffb3e0d4849963 (patch)
tree8c1af45d5f4cb1b85b6862ed1da660105e809b20 /sql/sql.gyp
parentb56d7d81c1d3a9f93f819faee2e0de5ccc315edf (diff)
downloadchromium_src-02ce712af589a5b722ebbf5c2fffb3e0d4849963.zip
chromium_src-02ce712af589a5b722ebbf5c2fffb3e0d4849963.tar.gz
chromium_src-02ce712af589a5b722ebbf5c2fffb3e0d4849963.tar.bz2
[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 Review URL: https://codereview.chromium.org/1325513002 Cr-Commit-Position: refs/heads/master@{#346212}
Diffstat (limited to 'sql/sql.gyp')
-rw-r--r--sql/sql.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp
index d983a45..018b287 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -27,8 +27,6 @@
'init_status.h',
'meta_table.cc',
'meta_table.h',
- 'proxy.cc',
- 'proxy.h',
'recovery.cc',
'recovery.h',
'statement.cc',