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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/build_config.h

Issue 8135024: Make use_nss a gyp var so that aura can build w/ nss. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review corrections Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/build_config.h
diff --git a/build/build_config.h b/build/build_config.h
index 9356e44c5552c325ba2bd11b39c2416ed38c512f..3dc75d616b1ddf8d664cb21f70468ae33941213c 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -44,14 +44,9 @@
#endif
#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \
- defined(OS_SOLARIS) || defined(OS_ANDROID)
-#if !defined(USE_OPENSSL)
-#define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen.
-#endif
-#ifndef OS_ANDROID
+ defined(OS_SOLARIS)
#define USE_X11 1 // Use X for graphics.
#endif
-#endif
#if defined(USE_OPENSSL) && defined(USE_NSS)
#error Cannot use both OpenSSL and NSS
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698