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

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

Issue 1179573004: Correct iOS device build for latest Xcode beta. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 5 years, 6 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/libxml/libxml.gyp ('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_ENABLE_FTS3', 12 'SQLITE_ENABLE_FTS3',
13 # New unicode61 tokenizer with built-in tables. 13 # New unicode61 tokenizer with built-in tables.
14 'SQLITE_DISABLE_FTS3_UNICODE', 14 'SQLITE_DISABLE_FTS3_UNICODE',
15 # Chromium currently does not enable fts4, disable extra code. 15 # Chromium currently does not enable fts4, disable extra code.
16 'SQLITE_DISABLE_FTS4_DEFERRED', 16 'SQLITE_DISABLE_FTS4_DEFERRED',
17 'SQLITE_ENABLE_ICU', 17 'SQLITE_ENABLE_ICU',
18 'SQLITE_ENABLE_MEMORY_MANAGEMENT', 18 'SQLITE_ENABLE_MEMORY_MANAGEMENT',
19 'SQLITE_SECURE_DELETE', 19 'SQLITE_SECURE_DELETE',
20 # Custom flag to tweak pcache pools. 20 # Custom flag to tweak pcache pools.
21 # TODO(shess): This shouldn't use faux-SQLite naming. 21 # TODO(shess): This shouldn't use faux-SQLite naming.
22 'SQLITE_SEPARATE_CACHE_POOLS', 22 'SQLITE_SEPARATE_CACHE_POOLS',
23 # TODO(shess): SQLite adds mutexes to protect structures which cross 23 # TODO(shess): SQLite adds mutexes to protect structures which cross
24 # threads. In theory Chromium should be able to turn this off for a 24 # threads. In theory Chromium should be able to turn this off for a
25 # slight speed boost. 25 # slight speed boost.
26 'THREADSAFE', 26 'THREADSAFE',
27 # TODO(shess): Figure out why this is here. Nobody references it 27 # TODO(shess): Figure out why this is here. Nobody references it
28 # directly. 28 # directly.
29 '_HAS_EXCEPTIONS=0', 29 '_HAS_EXCEPTIONS=0',
30 # NOTE(shess): Some defines can affect the amalgamation. Those should be 30 # NOTE(shess): Some defines can affect the amalgamation. Those should be
31 # added to google_generate_amalgamation.sh, and the amalgamation 31 # added to google_generate_amalgamation.sh, and the amalgamation
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 'USE_SYSTEM_SQLITE', 74 'USE_SYSTEM_SQLITE',
75 ], 75 ],
76 }, 76 },
77 77
78 'conditions': [ 78 'conditions': [
79 ['OS == "ios"', { 79 ['OS == "ios"', {
80 'dependencies': [ 80 'dependencies': [
81 'sqlite_regexp', 81 'sqlite_regexp',
82 ], 82 ],
83 'link_settings': { 83 'link_settings': {
84 'libraries': [ 84 'xcode_settings': {
85 '$(SDKROOT)/usr/lib/libsqlite3.dylib', 85 'OTHER_LDFLAGS': [
86 ], 86 '-lsqlite3',
87 ],
88 },
87 }, 89 },
88 }], 90 }],
89 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"' , { 91 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"' , {
90 'direct_dependent_settings': { 92 'direct_dependent_settings': {
91 'cflags': [ 93 'cflags': [
92 # This next command produces no output but it it will fail 94 # This next command produces no output but it it will fail
93 # (and cause GYP to fail) if we don't have a recent enough 95 # (and cause GYP to fail) if we don't have a recent enough
94 # version of sqlite. 96 # version of sqlite.
95 '<!@(pkg-config --atleast-version=<(required_sqlite_version) s qlite3)', 97 '<!@(pkg-config --atleast-version=<(required_sqlite_version) s qlite3)',
96 98
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 'SQLITE_CORE', 208 'SQLITE_CORE',
207 ], 209 ],
208 'sources': [ 210 'sources': [
209 'src/ext/icu/icu.c', 211 'src/ext/icu/icu.c',
210 ], 212 ],
211 }, 213 },
212 ], 214 ],
213 }], 215 }],
214 ], 216 ],
215 } 217 }
OLDNEW
« no previous file with comments | « third_party/libxml/libxml.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698