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

Side by Side Diff: third_party/sqlite/sqlite.gyp

Issue 606033002: Make FTS2 inclusion in SQLite optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sql/sqlite_features_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'use_system_sqlite%': 0, 7 'use_system_sqlite%': 0,
8 'required_sqlite_version': '3.6.1', 8 'required_sqlite_version': '3.6.1',
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
11 'defines': [ 11 'defines': [
12 'SQLITE_CORE', 12 'SQLITE_CORE',
13 'SQLITE_ENABLE_BROKEN_FTS2',
14 'SQLITE_ENABLE_FTS2',
15 'SQLITE_ENABLE_FTS3', 13 'SQLITE_ENABLE_FTS3',
16 'SQLITE_ENABLE_ICU', 14 'SQLITE_ENABLE_ICU',
17 'SQLITE_ENABLE_MEMORY_MANAGEMENT', 15 'SQLITE_ENABLE_MEMORY_MANAGEMENT',
18 'SQLITE_SECURE_DELETE', 16 'SQLITE_SECURE_DELETE',
19 'SQLITE_SEPARATE_CACHE_POOLS', 17 'SQLITE_SEPARATE_CACHE_POOLS',
20 'THREADSAFE', 18 'THREADSAFE',
21 '_HAS_EXCEPTIONS=0', 19 '_HAS_EXCEPTIONS=0',
22 ], 20 ],
23 }, 21 },
24 'targets': [ 22 'targets': [
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 ], 72 ],
75 }, 73 },
76 }], 74 }],
77 ], 75 ],
78 }, { # !use_system_sqlite 76 }, { # !use_system_sqlite
79 'product_name': 'sqlite3', 77 'product_name': 'sqlite3',
80 'type': 'static_library', 78 'type': 'static_library',
81 'sources': [ 79 'sources': [
82 'amalgamation/sqlite3.h', 80 'amalgamation/sqlite3.h',
83 'amalgamation/sqlite3.c', 81 'amalgamation/sqlite3.c',
84 # fts2.c currently has a lot of conflicts when added to
85 # the amalgamation. It is probably not worth fixing that.
86 'src/ext/fts2/fts2.c',
87 'src/ext/fts2/fts2.h',
88 'src/ext/fts2/fts2_hash.c',
89 'src/ext/fts2/fts2_hash.h',
90 'src/ext/fts2/fts2_icu.c',
91 'src/ext/fts2/fts2_porter.c',
92 'src/ext/fts2/fts2_tokenizer.c',
93 'src/ext/fts2/fts2_tokenizer.h',
94 'src/ext/fts2/fts2_tokenizer1.c',
95 ], 82 ],
96 83
97 # TODO(shess): Previously fts1 and rtree files were 84 # TODO(shess): Previously fts1 and rtree files were
98 # explicitly excluded from the build. Make sure they are 85 # explicitly excluded from the build. Make sure they are
99 # logically still excluded. 86 # logically still excluded.
100 87
101 # TODO(shess): Should all of the sources be listed and then 88 # TODO(shess): Should all of the sources be listed and then
102 # excluded? For editing purposes? 89 # excluded? For editing purposes?
103 90
104 'include_dirs': [ 91 'include_dirs': [
105 'amalgamation', 92 'amalgamation',
106 # Needed for fts2 to build.
107 'src/src',
108 ], 93 ],
109 'dependencies': [ 94 'dependencies': [
110 '../icu/icu.gyp:icui18n', 95 '../icu/icu.gyp:icui18n',
111 '../icu/icu.gyp:icuuc', 96 '../icu/icu.gyp:icuuc',
112 ], 97 ],
113 'direct_dependent_settings': { 98 'direct_dependent_settings': {
114 'include_dirs': [ 99 'include_dirs': [
115 '.', 100 '.',
116 '../..', 101 '../..',
117 ], 102 ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 '-Wno-int-to-pointer-cast', 145 '-Wno-int-to-pointer-cast',
161 '-Wno-pointer-to-int-cast', 146 '-Wno-pointer-to-int-cast',
162 ], 147 ],
163 }], 148 }],
164 # Enable feedback-directed optimisation for sqlite when building in android. 149 # Enable feedback-directed optimisation for sqlite when building in android.
165 ['android_webview_build == 1', { 150 ['android_webview_build == 1', {
166 'aosp_build_settings': { 151 'aosp_build_settings': {
167 'LOCAL_FDO_SUPPORT': 'true', 152 'LOCAL_FDO_SUPPORT': 'true',
168 }, 153 },
169 }], 154 }],
155 ['sqlite_enable_fts2', {
156 'defines': [
157 'SQLITE_ENABLE_BROKEN_FTS2',
158 'SQLITE_ENABLE_FTS2',
159 ],
160 'sources': [
161 # fts2.c currently has a lot of conflicts when added to
162 # the amalgamation. It is probably not worth fixing that.
163 'src/ext/fts2/fts2.c',
164 'src/ext/fts2/fts2.h',
165 'src/ext/fts2/fts2_hash.c',
166 'src/ext/fts2/fts2_hash.h',
167 'src/ext/fts2/fts2_icu.c',
168 'src/ext/fts2/fts2_porter.c',
169 'src/ext/fts2/fts2_tokenizer.c',
170 'src/ext/fts2/fts2_tokenizer.h',
171 'src/ext/fts2/fts2_tokenizer1.c',
172 ],
173 'include_dirs': [
174 'src/src',
175 ],
176 }],
170 ], 177 ],
171 }], 178 }],
172 ], 179 ],
173 }, 180 },
174 ], 181 ],
175 'conditions': [ 182 'conditions': [
176 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', { 183 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', {
177 'targets': [ 184 'targets': [
178 { 185 {
179 'target_name': 'sqlite_shell', 186 'target_name': 'sqlite_shell',
(...skipping 21 matching lines...) Expand all
201 '../icu/icu.gyp:icuuc', 208 '../icu/icu.gyp:icuuc',
202 ], 209 ],
203 'sources': [ 210 'sources': [
204 'src/ext/icu/icu.c', 211 'src/ext/icu/icu.c',
205 ], 212 ],
206 }, 213 },
207 ], 214 ],
208 }], 215 }],
209 ], 216 ],
210 } 217 }
OLDNEW
« no previous file with comments | « sql/sqlite_features_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698