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

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

Issue 1778823002: Revert of [sqlite] sql::Recovery working under USE_SYSTEM_SQLITE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@zzzzsql_ios_recover_review1
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 ], 91 ],
92 }], 92 }],
93 ['use_system_sqlite', { 93 ['use_system_sqlite', {
94 'type': 'none', 94 'type': 'none',
95 'direct_dependent_settings': { 95 'direct_dependent_settings': {
96 'defines': [ 96 'defines': [
97 'USE_SYSTEM_SQLITE', 97 'USE_SYSTEM_SQLITE',
98 ], 98 ],
99 }, 99 },
100 100
101 'dependencies': [
102 'sqlite_recover',
103 ],
104
105 'conditions': [ 101 'conditions': [
106 ['OS == "ios"', { 102 ['OS == "ios"', {
107 'dependencies': [ 103 'dependencies': [
108 'sqlite_regexp', 104 'sqlite_regexp',
109 ], 105 ],
110 'link_settings': { 106 'link_settings': {
111 'xcode_settings': { 107 'xcode_settings': {
112 'OTHER_LDFLAGS': [ 108 'OTHER_LDFLAGS': [
113 '-lsqlite3', 109 '-lsqlite3',
114 ], 110 ],
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 ], 208 ],
213 }], 209 }],
214 ], 210 ],
215 }], 211 }],
216 ], 212 ],
217 'includes': [ 213 'includes': [
218 # Disable LTO due to ELF section name out of range 214 # Disable LTO due to ELF section name out of range
219 # crbug.com/422251 215 # crbug.com/422251
220 '../../build/android/disable_gcc_lto.gypi', 216 '../../build/android/disable_gcc_lto.gypi',
221 ], 217 ],
222 }, {
223 # Virtual table used by sql::Recovery to recover corrupt databases, for
224 # use with USE_SYSTEM_SQLITE.
225 'target_name': 'sqlite_recover',
226 'type': 'static_library',
227 'sources': [
228 # TODO(shess): Move out of the SQLite source tree, perhaps to ext/.
229 'src/src/recover_varint.c',
230 'src/src/recover.c',
231 'src/src/recover.h',
232 ],
233 }, 218 },
234 ], 219 ],
235 'conditions': [ 220 'conditions': [
236 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', { 221 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', {
237 'targets': [ 222 'targets': [
238 { 223 {
239 'target_name': 'sqlite_shell', 224 'target_name': 'sqlite_shell',
240 'type': 'executable', 225 'type': 'executable',
241 'dependencies': [ 226 'dependencies': [
242 '../icu/icu.gyp:icuuc', 227 '../icu/icu.gyp:icuuc',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 'clang_warning_flags_unset': [ 260 'clang_warning_flags_unset': [
276 # icu.c uses assert(!"foo") instead of assert(false && "foo") 261 # icu.c uses assert(!"foo") instead of assert(false && "foo")
277 '-Wstring-conversion', 262 '-Wstring-conversion',
278 ], 263 ],
279 }, 264 },
280 }, 265 },
281 ], 266 ],
282 }], 267 }],
283 ], 268 ],
284 } 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