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

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: rebase Created 8 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 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 4459 matching lines...) Expand 10 before | Expand all | Expand 10 after
4470 }], 4470 }],
4471 ['use_nss==1', { 4471 ['use_nss==1', {
4472 'sources': [ 4472 'sources': [
4473 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', 4473 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
4474 'third_party/mozilla_security_manager/nsNSSCertHelper.h', 4474 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
4475 'third_party/mozilla_security_manager/nsNSSCertificate.cpp', 4475 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
4476 'third_party/mozilla_security_manager/nsNSSCertificate.h', 4476 'third_party/mozilla_security_manager/nsNSSCertificate.h',
4477 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp', 4477 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
4478 'third_party/mozilla_security_manager/nsUsageArrayHelper.h', 4478 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
4479 ], 4479 ],
4480 }, { # use_nss==0
4481 'sources!': [
4482 'browser/certificate_manager_model.cc',
4483 'browser/certificate_manager_model.h',
4484 'browser/ui/webui/options2/certificate_manager_handler2.cc',
4485 'browser/ui/webui/options2/certificate_manager_handler2.h',
4486 ],
4480 }], 4487 }],
4481 ['use_nss==0 and use_openssl==0', { 4488 ['use_nss==0 and use_openssl==0', {
4482 'sources!': [ 4489 'sources!': [
4483 'browser/certificate_manager_model.cc',
4484 'browser/certificate_manager_model.h',
4485 'browser/ui/webui/certificate_viewer_webui.cc', 4490 'browser/ui/webui/certificate_viewer_webui.cc',
4486 'browser/ui/webui/certificate_viewer_webui.h', 4491 'browser/ui/webui/certificate_viewer_webui.h',
4487 'browser/ui/webui/certificate_viewer_ui.cc', 4492 'browser/ui/webui/certificate_viewer_ui.cc',
4488 'browser/ui/webui/certificate_viewer_ui.h', 4493 'browser/ui/webui/certificate_viewer_ui.h',
4489 'browser/ui/webui/options2/certificate_manager_handler2.cc',
4490 'browser/ui/webui/options2/certificate_manager_handler2.h',
4491 ], 4494 ],
4492 }], 4495 }],
4493 ['toolkit_uses_gtk == 1', { 4496 ['toolkit_uses_gtk == 1', {
4494 'dependencies': [ 4497 'dependencies': [
4495 '../build/linux/system.gyp:dbus', 4498 '../build/linux/system.gyp:dbus',
4496 '../build/linux/system.gyp:gconf', 4499 '../build/linux/system.gyp:gconf',
4497 '../build/linux/system.gyp:gtk', 4500 '../build/linux/system.gyp:gtk',
4498 '../build/linux/system.gyp:gtkprint', 4501 '../build/linux/system.gyp:gtkprint',
4499 '../build/linux/system.gyp:ssl', 4502 '../build/linux/system.gyp:ssl',
4500 '../build/linux/system.gyp:x11', 4503 '../build/linux/system.gyp:x11',
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
5110 'browser/metrics/proto/study.proto', 5113 'browser/metrics/proto/study.proto',
5111 ], 5114 ],
5112 'variables': { 5115 'variables': {
5113 'proto_in_dir': 'browser/metrics/proto', 5116 'proto_in_dir': 'browser/metrics/proto',
5114 'proto_out_dir': 'chrome/browser/metrics/proto', 5117 'proto_out_dir': 'chrome/browser/metrics/proto',
5115 }, 5118 },
5116 'includes': [ '../build/protoc.gypi' ] 5119 'includes': [ '../build/protoc.gypi' ]
5117 }, 5120 },
5118 ], 5121 ],
5119 } 5122 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698