diff options
| author | the_jk <the_jk@opera.com> | 2014-10-03 04:36:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 11:36:35 +0000 |
| commit | ffdda02dd3b523b35f63c0580fcde3f17cdf1e9a (patch) | |
| tree | 4dc6c0c6690a0f63ccc1aa94090af65d8afb673a /sql | |
| parent | 136bd37b5b8df0b56347c59a52b490977c001c6f (diff) | |
| download | chromium_src-ffdda02dd3b523b35f63c0580fcde3f17cdf1e9a.zip chromium_src-ffdda02dd3b523b35f63c0580fcde3f17cdf1e9a.tar.gz chromium_src-ffdda02dd3b523b35f63c0580fcde3f17cdf1e9a.tar.bz2 | |
Make FTS2 inclusion in SQLite optional
Only platforms/products that need to support old history files need
FTS2 support in the included SQLite library.
BUG=418082
R=shess@chromium.org
R=michaeln@chromium.org
R=erikwright@chromium.org
Review URL: https://codereview.chromium.org/606033002
Cr-Commit-Position: refs/heads/master@{#298022}
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql.gyp | 5 | ||||
| -rw-r--r-- | sql/sqlite_features_unittest.cc | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp index 5926836..4642457 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -115,6 +115,11 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], + ['sqlite_enable_fts2', { + 'defines': [ + 'SQLITE_ENABLE_FTS2', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], diff --git a/sql/sqlite_features_unittest.cc b/sql/sqlite_features_unittest.cc index 101e038..e721693 100644 --- a/sql/sqlite_features_unittest.cc +++ b/sql/sqlite_features_unittest.cc @@ -63,10 +63,9 @@ TEST_F(SQLiteFeaturesTest, NoFTS1) { "CREATE VIRTUAL TABLE foo USING fts1(x)")); } -#if !defined(OS_IOS) +#if defined(SQLITE_ENABLE_FTS2) // fts2 is used for older history files, so we're signed on for keeping our -// version up-to-date. iOS does not include fts2, so this test does not run on -// iOS. +// version up-to-date. // TODO(shess): Think up a crazy way to get out from having to support // this forever. TEST_F(SQLiteFeaturesTest, FTS2) { |