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

Side by Side Diff: net/net.gyp

Issue 3104022: Move nsNSSCertTrust from chrome/third_party to net/third_party. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: header order Created 10 years, 4 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
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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 'base/x509_certificate.cc', 178 'base/x509_certificate.cc',
179 'base/x509_certificate.h', 179 'base/x509_certificate.h',
180 'base/x509_certificate_mac.cc', 180 'base/x509_certificate_mac.cc',
181 'base/x509_certificate_nss.cc', 181 'base/x509_certificate_nss.cc',
182 'base/x509_certificate_win.cc', 182 'base/x509_certificate_win.cc',
183 'base/x509_cert_types.cc', 183 'base/x509_cert_types.cc',
184 'base/x509_cert_types.h', 184 'base/x509_cert_types.h',
185 'base/x509_cert_types_mac.cc', 185 'base/x509_cert_types_mac.cc',
186 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 186 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
187 'third_party/mozilla_security_manager/nsKeygenHandler.h', 187 'third_party/mozilla_security_manager/nsKeygenHandler.h',
188 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
189 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
188 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 190 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
189 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 191 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
190 ], 192 ],
191 'export_dependent_settings': [ 193 'export_dependent_settings': [
192 '../base/base.gyp:base', 194 '../base/base.gyp:base',
193 ], 195 ],
194 'conditions': [ 196 'conditions': [
195 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 197 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
196 'dependencies': [ 198 'dependencies': [
197 '../build/linux/system.gyp:gconf', 199 '../build/linux/system.gyp:gconf',
198 '../build/linux/system.gyp:gdk', 200 '../build/linux/system.gyp:gdk',
199 '../build/linux/system.gyp:nss', 201 '../build/linux/system.gyp:nss',
200 '../build/linux/system.gyp:libresolv', 202 '../build/linux/system.gyp:libresolv',
201 ], 203 ],
202 }, 204 },
203 { # else: OS is not in the above list 205 { # else: OS is not in the above list
204 'sources!': [ 206 'sources!': [
205 'base/cert_database_nss.cc', 207 'base/cert_database_nss.cc',
206 'base/keygen_handler_nss.cc', 208 'base/keygen_handler_nss.cc',
207 'base/x509_certificate_nss.cc', 209 'base/x509_certificate_nss.cc',
208 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 210 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
209 'third_party/mozilla_security_manager/nsKeygenHandler.h', 211 'third_party/mozilla_security_manager/nsKeygenHandler.h',
212 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
213 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
210 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 214 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
211 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 215 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
212 ], 216 ],
213 }, 217 },
214 ], 218 ],
215 [ 'OS == "win"', { 219 [ 'OS == "win"', {
216 'dependencies': [ 220 'dependencies': [
217 '../third_party/nss/nss.gyp:nss', 221 '../third_party/nss/nss.gyp:nss',
218 'tld_cleanup', 222 'tld_cleanup',
219 ], 223 ],
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 ], 1153 ],
1150 }], 1154 }],
1151 ], 1155 ],
1152 } 1156 }
1153 1157
1154 # Local Variables: 1158 # Local Variables:
1155 # tab-width:2 1159 # tab-width:2
1156 # indent-tabs-mode:nil 1160 # indent-tabs-mode:nil
1157 # End: 1161 # End:
1158 # vim: set expandtab tabstop=2 shiftwidth=2: 1162 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698