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

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

Issue 1781973002: Revert of [sqlite] sql::Recovery working under USE_SYSTEM_SQLITE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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',
71 'sqlite_regexp', 70 'sqlite_regexp',
72 ], 71 ],
73 'link_settings': { 72 'link_settings': {
74 'xcode_settings': { 73 'xcode_settings': {
75 'OTHER_LDFLAGS': [ 74 'OTHER_LDFLAGS': [
76 '-lsqlite3', 75 '-lsqlite3',
77 ], 76 ],
78 }, 77 },
79 }, 78 },
80 }], 79 }],
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 'src/src/shell_icu_linux.c', 236 'src/src/shell_icu_linux.c',
238 # Include a dummy c++ file to force linking of libstdc++. 237 # Include a dummy c++ file to force linking of libstdc++.
239 'build_as_cpp.cc', 238 'build_as_cpp.cc',
240 ], 239 ],
241 }, 240 },
242 ], 241 ],
243 },], 242 },],
244 ['OS == "ios"', { 243 ['OS == "ios"', {
245 'targets': [ 244 'targets': [
246 { 245 {
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 {
259 'target_name': 'sqlite_regexp', 246 'target_name': 'sqlite_regexp',
260 'type': 'static_library', 247 'type': 'static_library',
261 'dependencies': [ 248 'dependencies': [
262 '../icu/icu.gyp:icui18n', 249 '../icu/icu.gyp:icui18n',
263 '../icu/icu.gyp:icuuc', 250 '../icu/icu.gyp:icuuc',
264 ], 251 ],
265 'defines': [ 252 'defines': [
266 # Necessary to statically compile the extension. 253 # Necessary to statically compile the extension.
267 'SQLITE_CORE', 254 'SQLITE_CORE',
268 ], 255 ],
269 'sources': [ 256 'sources': [
270 'src/ext/icu/icu.c', 257 'src/ext/icu/icu.c',
271 ], 258 ],
272 'variables': { 259 'variables': {
273 'clang_warning_flags_unset': [ 260 'clang_warning_flags_unset': [
274 # icu.c uses assert(!"foo") instead of assert(false && "foo") 261 # icu.c uses assert(!"foo") instead of assert(false && "foo")
275 '-Wstring-conversion', 262 '-Wstring-conversion',
276 ], 263 ],
277 }, 264 },
278 }, 265 },
279 ], 266 ],
280 }], 267 }],
281 ], 268 ],
282 } 269 }
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