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

Unified Diff: build/linux/system.gyp

Issue 4696004: openssl build fixes, and tidy the build files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: leave build files alone except for the minimal fixes 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 | « no previous file | chrome/common/net/url_fetcher_unittest.cc » ('j') | net/base/net_test_suite.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 271feef900a3bb21612839a96e2d607bf3f0ac62..cf25bb11f797cbd9e13e2d264b48188b685b414c 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -331,11 +331,8 @@
['use_openssl==1', {
'direct_dependent_settings': {
'defines': [
- # OpenSSL support is in development.
- # eventually USE_OPENSSL and USE_NSS will be mutually exclusive.
- # During the transitional period, a use_openssl=1 build still
- # needs to define USE_NSS, so it is necessary to test the
- # USE_OPENSSL macro before testing USE_NSS.
+ # OpenSSL support is incomplete: http://crbug.com/62803.
+ # Defining USE_OPENSSL disables USE_NSS.
'USE_OPENSSL',
],
'include_dirs': [
« no previous file with comments | « no previous file | chrome/common/net/url_fetcher_unittest.cc » ('j') | net/base/net_test_suite.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698