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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups Created 8 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 4473 matching lines...) Expand 10 before | Expand all | Expand 10 after
4484 }], 4484 }],
4485 ['use_nss==1', { 4485 ['use_nss==1', {
4486 'sources': [ 4486 'sources': [
4487 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', 4487 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
4488 'third_party/mozilla_security_manager/nsNSSCertHelper.h', 4488 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
4489 'third_party/mozilla_security_manager/nsNSSCertificate.cpp', 4489 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
4490 'third_party/mozilla_security_manager/nsNSSCertificate.h', 4490 'third_party/mozilla_security_manager/nsNSSCertificate.h',
4491 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp', 4491 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
4492 'third_party/mozilla_security_manager/nsUsageArrayHelper.h', 4492 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
4493 ], 4493 ],
4494 }, { # use_nss==0
4495 'sources!': [
4496 'browser/certificate_manager_model.cc',
4497 'browser/certificate_manager_model.h',
4498 'browser/ui/webui/options2/certificate_manager_handler2.cc',
4499 'browser/ui/webui/options2/certificate_manager_handler2.h',
4500 ],
4494 }], 4501 }],
4495 ['use_nss==0 and use_openssl==0', { 4502 ['use_nss==0 and use_openssl==0', {
4496 'sources!': [ 4503 'sources!': [
4497 'browser/certificate_manager_model.cc',
4498 'browser/certificate_manager_model.h',
4499 'browser/ui/webui/certificate_viewer_webui.cc', 4504 'browser/ui/webui/certificate_viewer_webui.cc',
4500 'browser/ui/webui/certificate_viewer_webui.h', 4505 'browser/ui/webui/certificate_viewer_webui.h',
4501 'browser/ui/webui/certificate_viewer_ui.cc', 4506 'browser/ui/webui/certificate_viewer_ui.cc',
4502 'browser/ui/webui/certificate_viewer_ui.h', 4507 'browser/ui/webui/certificate_viewer_ui.h',
4503 'browser/ui/webui/options2/certificate_manager_handler2.cc',
4504 'browser/ui/webui/options2/certificate_manager_handler2.h',
4505 ], 4508 ],
4506 }], 4509 }],
4507 ['toolkit_uses_gtk == 1', { 4510 ['toolkit_uses_gtk == 1', {
4508 'dependencies': [ 4511 'dependencies': [
4509 '../build/linux/system.gyp:dbus', 4512 '../build/linux/system.gyp:dbus',
4510 '../build/linux/system.gyp:gconf', 4513 '../build/linux/system.gyp:gconf',
4511 '../build/linux/system.gyp:gtk', 4514 '../build/linux/system.gyp:gtk',
4512 '../build/linux/system.gyp:gtkprint', 4515 '../build/linux/system.gyp:gtkprint',
4513 '../build/linux/system.gyp:ssl', 4516 '../build/linux/system.gyp:ssl',
4514 '../build/linux/system.gyp:x11', 4517 '../build/linux/system.gyp:x11',
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
5124 'browser/metrics/proto/study.proto', 5127 'browser/metrics/proto/study.proto',
5125 ], 5128 ],
5126 'variables': { 5129 'variables': {
5127 'proto_in_dir': 'browser/metrics/proto', 5130 'proto_in_dir': 'browser/metrics/proto',
5128 'proto_out_dir': 'chrome/browser/metrics/proto', 5131 'proto_out_dir': 'chrome/browser/metrics/proto',
5129 }, 5132 },
5130 'includes': [ '../build/protoc.gypi' ] 5133 'includes': [ '../build/protoc.gypi' ]
5131 }, 5134 },
5132 ], 5135 ],
5133 } 5136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698