| OLD | NEW |
| 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/net/third_party/nss/ssl.gyp. | 9 # This file is a modified copy of Chromium's src/net/third_party/nss/ssl.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 # The following modification was made to make sure we have the same | 12 # The following modification was made to make sure we have the same |
| 13 # xcode_settings on all configurations (otherwise we can't build with ninja): | 13 # xcode_settings on all configurations (otherwise we can't build with ninja): |
| 14 # 'configurations': { | 14 # 'configurations': { |
| 15 # 'Debug_Base': { | 15 # 'Debug_Base': { |
| 16 # + 'inherit_from': ['Dart_Base'], | 16 # + 'inherit_from': ['Dart_Base'], |
| 17 # 'defines': [ | 17 # 'defines': [ |
| 18 # 'DEBUG', | 18 # 'DEBUG', |
| 19 # ], | 19 # ], |
| 20 # }, | 20 # }, |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 '<(ssl_directory)/ssl/win32err.c', | 89 '<(ssl_directory)/ssl/win32err.c', |
| 90 '<(ssl_directory)/ssl/win32err.h', | 90 '<(ssl_directory)/ssl/win32err.h', |
| 91 # Changed by Dart: All files under '<(ssl_directory)/ssl/bodge' removed. | 91 # Changed by Dart: All files under '<(ssl_directory)/ssl/bodge' removed. |
| 92 ], | 92 ], |
| 93 # Changed by Dart: '<(ssl_directory)/' added to all paths. | 93 # Changed by Dart: '<(ssl_directory)/' added to all paths. |
| 94 'sources!': [ | 94 'sources!': [ |
| 95 '<(ssl_directory)/ssl/os2_err.c', | 95 '<(ssl_directory)/ssl/os2_err.c', |
| 96 '<(ssl_directory)/ssl/os2_err.h', | 96 '<(ssl_directory)/ssl/os2_err.h', |
| 97 ], | 97 ], |
| 98 'defines': [ | 98 'defines': [ |
| 99 'NO_PKCS11_BYPASS', |
| 99 'NSS_ENABLE_ECC', | 100 'NSS_ENABLE_ECC', |
| 100 'NSS_ENABLE_ZLIB', | |
| 101 'USE_UTIL_DIRECTLY', | 101 'USE_UTIL_DIRECTLY', |
| 102 ], | 102 ], |
| 103 'defines!': [ | 103 'defines!': [ |
| 104 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. | 104 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. |
| 105 'NO_NSPR_10_SUPPORT', | 105 'NO_NSPR_10_SUPPORT', |
| 106 ], | 106 ], |
| 107 'dependencies': [ | 107 'dependencies': [ |
| 108 # Changed by Dart. | 108 # Changed by Dart. |
| 109 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix) | 109 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix) |
| 110 # Dart: Start of copy of code from 'bodge' conditions section below. | 110 # Dart: Start of copy of code from 'bodge' conditions section below. |
| 111 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) | 111 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) |
| 112 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) | 112 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) |
| 113 ], | 113 ], |
| 114 'export_dependent_settings': [ | 114 'export_dependent_settings': [ |
| 115 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) | 115 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) |
| 116 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) | 116 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) |
| 117 ], | 117 ], |
| 118 'direct_dependent_settings': { | 118 'direct_dependent_settings': { |
| 119 'include_dirs': [ | 119 'include_dirs': [ |
| 120 '<(ssl_directory)/ssl', | 120 '<(ssl_directory)/ssl', |
| 121 ], | 121 ], |
| 122 'defines': [ | 122 'defines': [ |
| 123 'NSS_PLATFORM_CLIENT_AUTH', | 123 'NSS_PLATFORM_CLIENT_AUTH', |
| 124 ], | 124 ], |
| 125 # Dart: End of copy of code from bodge conditions section. | 125 # Dart: End of copy of code from bodge conditions section. |
| 126 }, | 126 }, |
| 127 'msvs_disabled_warnings': [4018, 4244], | 127 'msvs_disabled_warnings': [4018, 4244, 4267], |
| 128 'conditions': [ | 128 'conditions': [ |
| 129 ['component == "shared_library"', { |
| 130 'conditions': [ |
| 131 ['OS == "mac" or OS == "ios"', { |
| 132 'xcode_settings': { |
| 133 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', |
| 134 }, |
| 135 }], |
| 136 ['OS == "win"', { |
| 137 'sources': [ |
| 138 'ssl/exports_win.def', |
| 139 ], |
| 140 }], |
| 141 ['os_posix == 1 and OS != "mac" and OS != "ios"', { |
| 142 'cflags!': ['-fvisibility=hidden'], |
| 143 }], |
| 144 ], |
| 145 }], |
| 129 [ 'clang == 1', { | 146 [ 'clang == 1', { |
| 130 'cflags': [ | 147 'cflags': [ |
| 131 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the | 148 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the |
| 132 # system's cert.h because cert.h isn't in chromium's repo. | 149 # system's cert.h because cert.h isn't in chromium's repo. |
| 133 '-Wno-incompatible-pointer-types', | 150 '-Wno-incompatible-pointer-types', |
| 134 ], | 151 ], |
| 135 }], | 152 }], |
| 136 # Added by Dart. | 153 # Added by Dart. |
| 137 [ 'OS == "linux"', { | 154 [ 'OS == "linux"', { |
| 138 'defines': [ | 155 'defines': [ |
| 139 'XP_UNIX', | 156 'XP_UNIX', |
| 140 'NSS_PLATFORM_CLIENT_AUTH', | 157 'NSS_PLATFORM_CLIENT_AUTH', |
| 141 'NSS_USE_STATIC_LIBS', | 158 'NSS_USE_STATIC_LIBS', |
| 142 ], | 159 ], |
| 143 }], | 160 }], |
| 144 [ 'OS == "mac" or OS == "ios"', { | 161 [ 'OS == "mac" or OS == "ios"', { |
| 145 'defines': [ | 162 'defines': [ |
| 146 'XP_UNIX', | 163 'XP_UNIX', |
| 147 'DARWIN', | 164 'DARWIN', |
| 148 'XP_MACOSX', | 165 'XP_MACOSX', |
| 149 ], | 166 ], |
| 150 }], | 167 }], |
| 168 [ 'OS == "mac"', { |
| 169 'link_settings': { |
| 170 'libraries': [ |
| 171 '$(SDKROOT)/System/Library/Frameworks/Security.framework', |
| 172 ], |
| 173 }, |
| 174 }], |
| 151 [ 'OS == "win"', { | 175 [ 'OS == "win"', { |
| 152 'sources!': [ | 176 'sources!': [ |
| 153 '<(ssl_directory)/ssl/unix_err.c', | 177 '<(ssl_directory)/ssl/unix_err.c', |
| 154 '<(ssl_directory)/ssl/unix_err.h', | 178 '<(ssl_directory)/ssl/unix_err.h', |
| 155 ], | 179 ], |
| 156 }, | 180 }, |
| 157 { # else: OS != "win" | 181 { # else: OS != "win" |
| 158 'sources!': [ | 182 'sources!': [ |
| 159 '<(ssl_directory)/ssl/win32err.c', | 183 '<(ssl_directory)/ssl/win32err.c', |
| 160 '<(ssl_directory)/ssl/win32err.h', | 184 '<(ssl_directory)/ssl/win32err.h', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 174 'inherit_from': ['Dart_Base'], | 198 'inherit_from': ['Dart_Base'], |
| 175 'defines': [ | 199 'defines': [ |
| 176 'DEBUG', | 200 'DEBUG', |
| 177 ], | 201 ], |
| 178 }, | 202 }, |
| 179 }, | 203 }, |
| 180 }, | 204 }, |
| 181 ], | 205 ], |
| 182 }]], | 206 }]], |
| 183 } | 207 } |
| OLD | NEW |