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

Side by Side Diff: dart/runtime/bin/net/sqlite.gyp

Issue 11413141: Roll NSS to 169195. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « dart/runtime/bin/net/nss.gyp ('k') | dart/runtime/bin/net/ssl.gyp » ('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 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 5 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
6 # for details. All rights reserved. Use of this source code is governed by a 6 # for details. All rights reserved. Use of this source code is governed by a
7 # BSD-style license that can be found in the LICENSE file. 7 # BSD-style license that can be found in the LICENSE file.
8 8
9 # This file is a modified copy of Chromium's src/third_party/sqlite/sqlite.gyp. 9 # This file is a modified copy of Chromium's src/third_party/sqlite/sqlite.gyp.
10 # Revision 165464 (this should agree with "nss_rev" in DEPS). 10 # Revision 169195 (this should agree with "nss_rev" in DEPS).
11 { 11 {
12 # Added by Dart. All Dart comments refer to the following block or line. 12 # Added by Dart. All Dart comments refer to the following block or line.
13 'includes': [ 13 'includes': [
14 '../../tools/gyp/runtime-configurations.gypi', 14 '../../tools/gyp/runtime-configurations.gypi',
15 '../../tools/gyp/nss_configurations.gypi', 15 '../../tools/gyp/nss_configurations.gypi',
16 ], 16 ],
17 'variables': { 17 'variables': {
18 # Added by Dart. 18 # Added by Dart.
19 'sqlite_directory': '../../../third_party/sqlite', 19 'sqlite_directory': '../../../third_party/sqlite',
20 'use_system_sqlite%': 0, 20 'use_system_sqlite%': 0,
(...skipping 10 matching lines...) Expand all
31 'SQLITE_ENABLE_MEMORY_MANAGEMENT', 31 'SQLITE_ENABLE_MEMORY_MANAGEMENT',
32 'SQLITE_SECURE_DELETE', 32 'SQLITE_SECURE_DELETE',
33 'THREADSAFE', 33 'THREADSAFE',
34 '_HAS_EXCEPTIONS=0', 34 '_HAS_EXCEPTIONS=0',
35 ], 35 ],
36 }, 36 },
37 # Added by Dart. We do not indent, so diffs with the original are clearer. 37 # Added by Dart. We do not indent, so diffs with the original are clearer.
38 'conditions': [[ 'dart_io_support==1', { 38 'conditions': [[ 'dart_io_support==1', {
39 'targets': [ 39 'targets': [
40 { 40 {
41 'target_name': 'sqlite_dart', 41 'target_name': 'sqlite_dart', # Added by Dart (the _dart postfix)
42 'conditions': [ 42 'conditions': [
43 [ 'chromeos==1' , { 43 [ 'chromeos==1' , {
44 'defines': [ 44 'defines': [
45 # Despite obvious warnings about not using this flag 45 # Despite obvious warnings about not using this flag
46 # in deployment, we are turning off sync in ChromeOS 46 # in deployment, we are turning off sync in ChromeOS
47 # and relying on the underlying journaling filesystem 47 # and relying on the underlying journaling filesystem
48 # to do error recovery properly. It's much faster. 48 # to do error recovery properly. It's much faster.
49 'SQLITE_NO_SYNC', 49 'SQLITE_NO_SYNC',
50 ], 50 ],
51 }, 51 },
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 }], 177 }],
178 ], 178 ],
179 }], 179 }],
180 ], 180 ],
181 }, 181 },
182 ], 182 ],
183 'conditions': [ 183 'conditions': [
184 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', { 184 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', {
185 'targets': [ 185 'targets': [
186 { 186 {
187 'target_name': 'sqlite_shell_dart', 187 'target_name': 'sqlite_shell_dart', # Added by Dart (the _dart postfi x)
188 'type': 'executable', 188 'type': 'executable',
189 'dependencies': [ 189 'dependencies': [
190 # Disabled by Dart. 190 # Disabled by Dart.
191 # '../icu/icu.gyp:icuuc', 191 # '../icu/icu.gyp:icuuc',
192 'sqlite_dart', 192 'sqlite_dart', # Added by Dart (the _dart postfix)
193 ], 193 ],
194 'sources': [ 194 'sources': [
195 '<(sqlite_directory)/src/src/shell.c', 195 '<(sqlite_directory)/src/src/shell.c',
196 '<(sqlite_directory)/src/src/shell_icu_linux.c', 196 '<(sqlite_directory)/src/src/shell_icu_linux.c',
197 ], 197 ],
198 'link_settings': { 198 'link_settings': {
199 'link_languages': ['c++'], 199 'link_languages': ['c++'],
200 }, 200 },
201 }, 201 },
202 ], 202 ],
203 },] 203 },]
204 ], 204 ],
205 }]], 205 }]],
206 } 206 }
OLDNEW
« no previous file with comments | « dart/runtime/bin/net/nss.gyp ('k') | dart/runtime/bin/net/ssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698