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

Unified Diff: dart/runtime/bin/net/ssl.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dart/runtime/bin/net/sqlite.gyp ('k') | dart/runtime/bin/net/zlib.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/runtime/bin/net/ssl.gyp
===================================================================
--- dart/runtime/bin/net/ssl.gyp (revision 23018)
+++ dart/runtime/bin/net/ssl.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/net/third_party/nss/ssl.gyp.
-# Revision 169195 (this should agree with "nss_rev" in DEPS).
+# Revision 199075 (this should agree with "nss_rev" in DEPS).
# The following modification was made to make sure we have the same
# xcode_settings on all configurations (otherwise we can't build with ninja):
@@ -96,8 +96,8 @@
'<(ssl_directory)/ssl/os2_err.h',
],
'defines': [
+ 'NO_PKCS11_BYPASS',
'NSS_ENABLE_ECC',
- 'NSS_ENABLE_ZLIB',
'USE_UTIL_DIRECTLY',
],
'defines!': [
@@ -124,8 +124,25 @@
],
# Dart: End of copy of code from bodge conditions section.
},
- 'msvs_disabled_warnings': [4018, 4244],
+ 'msvs_disabled_warnings': [4018, 4244, 4267],
'conditions': [
+ ['component == "shared_library"', {
+ 'conditions': [
+ ['OS == "mac" or OS == "ios"', {
+ 'xcode_settings': {
+ 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
+ },
+ }],
+ ['OS == "win"', {
+ 'sources': [
+ 'ssl/exports_win.def',
+ ],
+ }],
+ ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+ 'cflags!': ['-fvisibility=hidden'],
+ }],
+ ],
+ }],
[ 'clang == 1', {
'cflags': [
# See http://crbug.com/138571#c8. In short, sslsecur.c picks up the
@@ -148,6 +165,13 @@
'XP_MACOSX',
],
}],
+ [ 'OS == "mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/Security.framework',
+ ],
+ },
+ }],
[ 'OS == "win"', {
'sources!': [
'<(ssl_directory)/ssl/unix_err.c',
« no previous file with comments | « dart/runtime/bin/net/sqlite.gyp ('k') | dart/runtime/bin/net/zlib.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698