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

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

Issue 1785443004: [sqlite] sql::Recovery working under USE_SYSTEM_SQLITE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment out unused constants. Created 4 years, 9 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 | « third_party/sqlite/BUILD.gn ('k') | third_party/sqlite/src/src/recover.c » ('j') | 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': {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 'type': 'none', 60 'type': 'none',
61 'direct_dependent_settings': { 61 'direct_dependent_settings': {
62 'defines': [ 62 'defines': [
63 'USE_SYSTEM_SQLITE', 63 'USE_SYSTEM_SQLITE',
64 ], 64 ],
65 }, 65 },
66 66
67 'conditions': [ 67 'conditions': [
68 ['OS == "ios"', { 68 ['OS == "ios"', {
69 'dependencies': [ 69 'dependencies': [
70 'sqlite_recover',
70 'sqlite_regexp', 71 'sqlite_regexp',
71 ], 72 ],
72 'link_settings': { 73 'link_settings': {
73 'xcode_settings': { 74 'xcode_settings': {
74 'OTHER_LDFLAGS': [ 75 'OTHER_LDFLAGS': [
75 '-lsqlite3', 76 '-lsqlite3',
76 ], 77 ],
77 }, 78 },
78 }, 79 },
79 }], 80 }],
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 'src/src/shell_icu_linux.c', 237 'src/src/shell_icu_linux.c',
237 # Include a dummy c++ file to force linking of libstdc++. 238 # Include a dummy c++ file to force linking of libstdc++.
238 'build_as_cpp.cc', 239 'build_as_cpp.cc',
239 ], 240 ],
240 }, 241 },
241 ], 242 ],
242 },], 243 },],
243 ['OS == "ios"', { 244 ['OS == "ios"', {
244 'targets': [ 245 'targets': [
245 { 246 {
247 # Virtual table used by sql::Recovery to recover corrupt
248 # databases, for use with USE_SYSTEM_SQLITE.
249 'target_name': 'sqlite_recover',
250 'type': 'static_library',
251 'sources': [
252 # TODO(shess): Move out of the SQLite source tree, perhaps to ext/.
253 'src/src/recover_varint.c',
254 'src/src/recover.c',
255 'src/src/recover.h',
256 ],
257 },
258 {
246 'target_name': 'sqlite_regexp', 259 'target_name': 'sqlite_regexp',
247 'type': 'static_library', 260 'type': 'static_library',
248 'dependencies': [ 261 'dependencies': [
249 '../icu/icu.gyp:icui18n', 262 '../icu/icu.gyp:icui18n',
250 '../icu/icu.gyp:icuuc', 263 '../icu/icu.gyp:icuuc',
251 ], 264 ],
252 'defines': [ 265 'defines': [
253 # Necessary to statically compile the extension. 266 # Necessary to statically compile the extension.
254 'SQLITE_CORE', 267 'SQLITE_CORE',
255 ], 268 ],
256 'sources': [ 269 'sources': [
257 'src/ext/icu/icu.c', 270 'src/ext/icu/icu.c',
258 ], 271 ],
259 'variables': { 272 'variables': {
260 'clang_warning_flags_unset': [ 273 'clang_warning_flags_unset': [
261 # icu.c uses assert(!"foo") instead of assert(false && "foo") 274 # icu.c uses assert(!"foo") instead of assert(false && "foo")
262 '-Wstring-conversion', 275 '-Wstring-conversion',
263 ], 276 ],
264 }, 277 },
265 }, 278 },
266 ], 279 ],
267 }], 280 }],
268 ], 281 ],
269 } 282 }
OLDNEW
« no previous file with comments | « third_party/sqlite/BUILD.gn ('k') | third_party/sqlite/src/src/recover.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698