summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 14:22:01 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 14:22:01 +0000
commit0090c09e67bea1636d5b6270e92170236f7c2e75 (patch)
tree7f04bb2ef0bfc97df58458e53e514e60000fe4a2 /chrome/chrome_browser.gypi
parent56888f9877ad37ee62a8d751d3e448fd57d4e48a (diff)
downloadchromium_src-0090c09e67bea1636d5b6270e92170236f7c2e75.zip
chromium_src-0090c09e67bea1636d5b6270e92170236f7c2e75.tar.gz
chromium_src-0090c09e67bea1636d5b6270e92170236f7c2e75.tar.bz2
Followup on http://codereview.chromium.org/3815012/show
Addresses a couple of nits (no functional changes). BUG=None TEST=None Review URL: http://codereview.chromium.org/4097005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi16
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0003524..62f7fd2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3432,12 +3432,6 @@
],
'sources': [
'browser/crash_handler_host_linux.h',
- 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
- 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertificate.h',
- 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
- 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
],
'conditions': [
['use_gnome_keyring==1', {
@@ -3466,6 +3460,16 @@
'browser/crash_handler_host_linux_stub.cc',
],
}],
+ ['use_openssl==0', {
+ 'sources': [
+ 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
+ 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
+ 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
+ 'third_party/mozilla_security_manager/nsNSSCertificate.h',
+ 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
+ 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
+ ],
+ }],
],
}, { # OS != "linux"
'sources!': [