diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 14:34:57 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 14:34:57 +0000 |
| commit | c329adf85eebdcc4318019d7a295c4f6f5e6612c (patch) | |
| tree | 6e6e55fffef301fb0cf059e01bb1547d5e4b2c67 /build/build_config.h | |
| parent | ba5e1bc7f3885f55bfe237f4439468177ebb5525 (diff) | |
| download | chromium_src-c329adf85eebdcc4318019d7a295c4f6f5e6612c.zip chromium_src-c329adf85eebdcc4318019d7a295c4f6f5e6612c.tar.gz chromium_src-c329adf85eebdcc4318019d7a295c4f6f5e6612c.tar.bz2 | |
Make use_nss a gyp var so that aura can build w/ nss.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8135024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/build_config.h')
| -rw-r--r-- | build/build_config.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/build/build_config.h b/build/build_config.h index 9356e44..3dc75d6 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 |