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

Side by Side Diff: net/net.gyp

Issue 2824014: Move the Mozilla-derived code in net/base/keygen_handler_nss.cc... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Update URL in README.chromium. Created 10 years, 6 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 | « net/base/keygen_handler_nss.cc ('k') | net/third_party/mozilla_security_manager/LICENSE » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 'base/winsock_init.cc', 162 'base/winsock_init.cc',
163 'base/winsock_init.h', 163 'base/winsock_init.h',
164 'base/x509_certificate.cc', 164 'base/x509_certificate.cc',
165 'base/x509_certificate.h', 165 'base/x509_certificate.h',
166 'base/x509_certificate_mac.cc', 166 'base/x509_certificate_mac.cc',
167 'base/x509_certificate_nss.cc', 167 'base/x509_certificate_nss.cc',
168 'base/x509_certificate_win.cc', 168 'base/x509_certificate_win.cc',
169 'base/x509_cert_types.cc', 169 'base/x509_cert_types.cc',
170 'base/x509_cert_types.h', 170 'base/x509_cert_types.h',
171 'base/x509_cert_types_mac.cc', 171 'base/x509_cert_types_mac.cc',
172 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
173 'third_party/mozilla_security_manager/nsKeygenHandler.h',
172 ], 174 ],
173 'export_dependent_settings': [ 175 'export_dependent_settings': [
174 '../base/base.gyp:base', 176 '../base/base.gyp:base',
175 ], 177 ],
176 'conditions': [ 178 'conditions': [
177 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 179 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
178 'dependencies': [ 180 'dependencies': [
179 '../build/linux/system.gyp:gconf', 181 '../build/linux/system.gyp:gconf',
180 '../build/linux/system.gyp:gdk', 182 '../build/linux/system.gyp:gdk',
181 '../build/linux/system.gyp:nss', 183 '../build/linux/system.gyp:nss',
182 ], 184 ],
183 }, 185 },
184 { # else: OS is not in the above list 186 { # else: OS is not in the above list
185 'sources!': [ 187 'sources!': [
186 'base/cert_database_nss.cc', 188 'base/cert_database_nss.cc',
187 'base/keygen_handler_nss.cc', 189 'base/keygen_handler_nss.cc',
188 'base/x509_certificate_nss.cc', 190 'base/x509_certificate_nss.cc',
191 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
192 'third_party/mozilla_security_manager/nsKeygenHandler.h',
189 ], 193 ],
190 }, 194 },
191 ], 195 ],
192 [ 'OS == "win"', { 196 [ 'OS == "win"', {
193 'dependencies': [ 197 'dependencies': [
194 # For nss_memio.{c,h}, which require only NSPR. 198 # For nss_memio.{c,h}, which require only NSPR.
195 '../third_party/nss/nss.gyp:nspr', 199 '../third_party/nss/nss.gyp:nspr',
196 'tld_cleanup', 200 'tld_cleanup',
197 ], 201 ],
198 }, 202 },
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 ], 1071 ],
1068 }], 1072 }],
1069 ], 1073 ],
1070 } 1074 }
1071 1075
1072 # Local Variables: 1076 # Local Variables:
1073 # tab-width:2 1077 # tab-width:2
1074 # indent-tabs-mode:nil 1078 # indent-tabs-mode:nil
1075 # End: 1079 # End:
1076 # vim: set expandtab tabstop=2 shiftwidth=2: 1080 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « net/base/keygen_handler_nss.cc ('k') | net/third_party/mozilla_security_manager/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698