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

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

Issue 15371008: dart:io | Roll third_party/nss from Chromium to revision 199075. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 7 years, 7 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 | 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) 2013, 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 169195 (this should agree with "nss_rev" in DEPS). 10 # Revision 199075 (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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 # Disabled by Dart. 125 # Disabled by Dart.
126 # '../icu/icu.gyp:icuuc', 126 # '../icu/icu.gyp:icuuc',
127 ], 127 ],
128 'direct_dependent_settings': { 128 'direct_dependent_settings': {
129 'include_dirs': [ 129 'include_dirs': [
130 '<(sqlite_directory)/.', 130 '<(sqlite_directory)/.',
131 '<(sqlite_directory)/../..', 131 '<(sqlite_directory)/../..',
132 ], 132 ],
133 }, 133 },
134 'msvs_disabled_warnings': [ 134 'msvs_disabled_warnings': [
135 4018, 4244, 135 4018, 4244, 4267,
136 ], 136 ],
137 'conditions': [ 137 'conditions': [
138 ['OS=="linux"', { 138 ['OS=="linux"', {
139 'link_settings': { 139 'link_settings': {
140 'libraries': [ 140 'libraries': [
141 '-ldl', 141 '-ldl',
142 ], 142 ],
143 }, 143 },
144 }], 144 }],
145 ['OS == "android"', { 145 ['OS == "android"', {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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

Powered by Google App Engine
This is Rietveld 408576698