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

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: chromeos compile fix 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 4410 matching lines...) Expand 10 before | Expand all | Expand 10 after
4421 ['use_nss==1', { 4421 ['use_nss==1', {
4422 'sources': [ 4422 'sources': [
4423 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', 4423 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
4424 'third_party/mozilla_security_manager/nsNSSCertHelper.h', 4424 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
4425 'third_party/mozilla_security_manager/nsNSSCertificate.cpp', 4425 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
4426 'third_party/mozilla_security_manager/nsNSSCertificate.h', 4426 'third_party/mozilla_security_manager/nsNSSCertificate.h',
4427 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp', 4427 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
4428 'third_party/mozilla_security_manager/nsUsageArrayHelper.h', 4428 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
4429 ], 4429 ],
4430 }], 4430 }],
4431 ['use_nss==0', {
4432 'sources!': [
4433 'browser/certificate_manager_model.cc',
4434 'browser/certificate_manager_model.h',
4435 'browser/ui/webui/options2/certificate_manager_handler2.cc',
4436 'browser/ui/webui/options2/certificate_manager_handler2.h',
4437 ],
4438 }],
4431 ['use_nss==0 and use_openssl==0', { 4439 ['use_nss==0 and use_openssl==0', {
4432 'sources!': [ 4440 'sources!': [
4433 'browser/certificate_manager_model.cc',
4434 'browser/certificate_manager_model.h',
4435 'browser/ui/webui/certificate_viewer_webui.cc', 4441 'browser/ui/webui/certificate_viewer_webui.cc',
4436 'browser/ui/webui/certificate_viewer_webui.h', 4442 'browser/ui/webui/certificate_viewer_webui.h',
4437 'browser/ui/webui/certificate_viewer_ui.cc', 4443 'browser/ui/webui/certificate_viewer_ui.cc',
4438 'browser/ui/webui/certificate_viewer_ui.h', 4444 'browser/ui/webui/certificate_viewer_ui.h',
4439 'browser/ui/webui/options2/certificate_manager_handler2.cc',
4440 'browser/ui/webui/options2/certificate_manager_handler2.h',
4441 ], 4445 ],
4442 }], 4446 }],
4443 ['toolkit_uses_gtk == 1', { 4447 ['toolkit_uses_gtk == 1', {
4444 'dependencies': [ 4448 'dependencies': [
4445 '../build/linux/system.gyp:dbus', 4449 '../build/linux/system.gyp:dbus',
4446 '../build/linux/system.gyp:gconf', 4450 '../build/linux/system.gyp:gconf',
4447 '../build/linux/system.gyp:gtk', 4451 '../build/linux/system.gyp:gtk',
4448 '../build/linux/system.gyp:gtkprint', 4452 '../build/linux/system.gyp:gtkprint',
4449 '../build/linux/system.gyp:ssl', 4453 '../build/linux/system.gyp:ssl',
4450 '../build/linux/system.gyp:x11', 4454 '../build/linux/system.gyp:x11',
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
5054 'type': 'static_library', 5058 'type': 'static_library',
5055 'sources': [ 'browser/chromeos/gdata/gdata.proto' ], 5059 'sources': [ 'browser/chromeos/gdata/gdata.proto' ],
5056 'variables': { 5060 'variables': {
5057 'proto_in_dir': 'browser/chromeos/gdata', 5061 'proto_in_dir': 'browser/chromeos/gdata',
5058 'proto_out_dir': 'chrome/browser/chromeos/gdata', 5062 'proto_out_dir': 'chrome/browser/chromeos/gdata',
5059 }, 5063 },
5060 'includes': [ '../build/protoc.gypi' ] 5064 'includes': [ '../build/protoc.gypi' ]
5061 }, 5065 },
5062 ], 5066 ],
5063 } 5067 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698