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

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

Issue 11369152: Disable NSS build targets in a Dartium build. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add comma, comment. Created 8 years, 1 month 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
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 165464 (this should agree with "nss_rev" in DEPS).
(...skipping 16 matching lines...) Expand all
27 'SQLITE_ENABLE_FTS2', 27 'SQLITE_ENABLE_FTS2',
28 'SQLITE_ENABLE_FTS3', 28 'SQLITE_ENABLE_FTS3',
29 # Disabled by Dart: An external module with advanced unicode functions. 29 # Disabled by Dart: An external module with advanced unicode functions.
30 # 'SQLITE_ENABLE_ICU', 30 # 'SQLITE_ENABLE_ICU',
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.
38 'conditions': [[ 'in_dartium==0', {
37 'targets': [ 39 'targets': [
38 { 40 {
39 'target_name': 'sqlite_dart', 41 'target_name': 'sqlite_dart',
40 'conditions': [ 42 'conditions': [
41 [ 'chromeos==1' , { 43 [ 'chromeos==1' , {
42 'defines': [ 44 'defines': [
43 # Despite obvious warnings about not using this flag 45 # Despite obvious warnings about not using this flag
44 # in deployment, we are turning off sync in ChromeOS 46 # in deployment, we are turning off sync in ChromeOS
45 # and relying on the underlying journaling filesystem 47 # and relying on the underlying journaling filesystem
46 # to do error recovery properly. It's much faster. 48 # to do error recovery properly. It's much faster.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 '<(sqlite_directory)/src/src/shell.c', 195 '<(sqlite_directory)/src/src/shell.c',
194 '<(sqlite_directory)/src/src/shell_icu_linux.c', 196 '<(sqlite_directory)/src/src/shell_icu_linux.c',
195 ], 197 ],
196 'link_settings': { 198 'link_settings': {
197 'link_languages': ['c++'], 199 'link_languages': ['c++'],
198 }, 200 },
199 }, 201 },
200 ], 202 ],
201 },] 203 },]
202 ], 204 ],
205 }]],
203 } 206 }
OLDNEW
« no previous file with comments | « runtime/bin/net/nss.gyp ('k') | runtime/bin/net/ssl.gyp » ('j') | tools/gyp/all.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698