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

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

Issue 574443002: Update NSS to 3.16.4. Updated to Chromium's copy of NSS at revision 291806 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 6 years, 3 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
« no previous file with comments | « dart/runtime/bin/net/nss_memio.cc ('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 257452 (this should agree with "nss_rev" in DEPS). 10 # Revision 291806 (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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ], 132 ],
133 'direct_dependent_settings': { 133 'direct_dependent_settings': {
134 'include_dirs': [ 134 'include_dirs': [
135 '<(sqlite_directory)/.', 135 '<(sqlite_directory)/.',
136 '<(sqlite_directory)/../..', 136 '<(sqlite_directory)/../..',
137 ], 137 ],
138 }, 138 },
139 'msvs_disabled_warnings': [ 139 'msvs_disabled_warnings': [
140 4018, 4244, 4267, 140 4018, 4244, 4267,
141 ], 141 ],
142 'variables': {
143 'clang_warning_flags': [
144 # sqlite does `if (*a++ && *b++);` in a non-buggy way.
145 '-Wno-empty-body',
146 # sqlite has some `unsigned < 0` checks.
147 '-Wno-tautological-compare',
148 ],
149 },
142 'conditions': [ 150 'conditions': [
143 ['OS=="linux"', { 151 ['OS=="linux"', {
144 'link_settings': { 152 'link_settings': {
145 'libraries': [ 153 'libraries': [
146 '-ldl', 154 '-ldl',
147 ], 155 ],
148 }, 156 },
149 }], 157 }],
150 ['OS == "mac" or OS == "ios"', { 158 ['OS == "mac" or OS == "ios"', {
151 'link_settings': { 159 'link_settings': {
(...skipping 14 matching lines...) Expand all
166 }], 174 }],
167 ['os_posix == 1 and OS != "mac" and OS != "android"', { 175 ['os_posix == 1 and OS != "mac" and OS != "android"', {
168 'cflags': [ 176 'cflags': [
169 # SQLite doesn't believe in compiler warnings, 177 # SQLite doesn't believe in compiler warnings,
170 # preferring testing. 178 # preferring testing.
171 # http://www.sqlite.org/faq.html#q17 179 # http://www.sqlite.org/faq.html#q17
172 '-Wno-int-to-pointer-cast', 180 '-Wno-int-to-pointer-cast',
173 '-Wno-pointer-to-int-cast', 181 '-Wno-pointer-to-int-cast',
174 ], 182 ],
175 }], 183 }],
176 ['clang==1', {
177 'xcode_settings': {
178 'WARNING_CFLAGS': [
179 # sqlite does `if (*a++ && *b++);` in a non-buggy way.
180 '-Wno-empty-body',
181 # sqlite has some `unsigned < 0` checks.
182 '-Wno-tautological-compare',
183 ],
184 },
185 'cflags': [
186 '-Wno-empty-body',
187 '-Wno-tautological-compare',
188 ],
189 }],
190 ], 184 ],
191 }], 185 }],
192 ], 186 ],
193 }, 187 },
194 ], 188 ],
195 'conditions': [ 189 'conditions': [
196 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', { 190 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', {
197 'targets': [ 191 'targets': [
198 { 192 {
199 'target_name': 'sqlite_shell_dart', # Added by Dart (the _dart postfi x) 193 'target_name': 'sqlite_shell_dart', # Added by Dart (the _dart postfi x)
(...skipping 23 matching lines...) Expand all
223 ], 217 ],
224 'sources': [ 218 'sources': [
225 'src/ext/icu/icu.c', 219 'src/ext/icu/icu.c',
226 ], 220 ],
227 }, 221 },
228 ], 222 ],
229 }], 223 }],
230 ], 224 ],
231 }]], 225 }]],
232 } 226 }
OLDNEW
« no previous file with comments | « dart/runtime/bin/net/nss_memio.cc ('k') | dart/runtime/bin/net/ssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698