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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/runtime/bin/net/sqlite.gyp
===================================================================
--- dart/runtime/bin/net/sqlite.gyp (revision 40429)
+++ dart/runtime/bin/net/sqlite.gyp (working copy)
@@ -7,7 +7,7 @@
# BSD-style license that can be found in the LICENSE file.
# This file is a modified copy of Chromium's src/third_party/sqlite/sqlite.gyp.
-# Revision 257452 (this should agree with "nss_rev" in DEPS).
+# Revision 291806 (this should agree with "nss_rev" in DEPS).
{
# Added by Dart. All Dart comments refer to the following block or line.
'includes': [
@@ -139,6 +139,14 @@
'msvs_disabled_warnings': [
4018, 4244, 4267,
],
+ 'variables': {
+ 'clang_warning_flags': [
+ # sqlite does `if (*a++ && *b++);` in a non-buggy way.
+ '-Wno-empty-body',
+ # sqlite has some `unsigned < 0` checks.
+ '-Wno-tautological-compare',
+ ],
+ },
'conditions': [
['OS=="linux"', {
'link_settings': {
@@ -173,20 +181,6 @@
'-Wno-pointer-to-int-cast',
],
}],
- ['clang==1', {
- 'xcode_settings': {
- 'WARNING_CFLAGS': [
- # sqlite does `if (*a++ && *b++);` in a non-buggy way.
- '-Wno-empty-body',
- # sqlite has some `unsigned < 0` checks.
- '-Wno-tautological-compare',
- ],
- },
- 'cflags': [
- '-Wno-empty-body',
- '-Wno-tautological-compare',
- ],
- }],
],
}],
],
« 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