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

Unified Diff: build/common.gypi

Issue 5014001: Reverted because openssl_helper needs to build even on non-openssl builds... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gypi ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 66121)
+++ build/common.gypi (working copy)
@@ -653,18 +653,6 @@
['toolkit_views==0', {
'sources/': [ ['exclude', '_views\\.cc$'] ]
}],
- ['use_openssl==1', {
- 'sources/': [
- ['exclude', '_nss\\.(cc|c)$'],
- ['exclude', '/nss/'],
- ['exclude', '(/|_|^)nss_[^/]*\\.(cc|c)$'],
- ],
- }, {
- 'sources/': [
- ['exclude', '_openssl\\.cc$'],
- ['exclude', '(/|_|^)openssl_[^/]*\\.cc$'],
- ],
- }],
],
}],
], # target_conditions for 'target_defaults'
« no previous file with comments | « base/base.gypi ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698