diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 03:30:42 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 03:30:42 +0000 |
| commit | e0b85a56b9e482b844729747d008e5de4f516dde (patch) | |
| tree | d627c090caf7ee28712d2e5bb05b7ebfa908cc28 /build | |
| parent | 2532ff91b2503ee2bde669dd3a0b24b94852c456 (diff) | |
| download | chromium_src-e0b85a56b9e482b844729747d008e5de4f516dde.zip chromium_src-e0b85a56b9e482b844729747d008e5de4f516dde.tar.gz chromium_src-e0b85a56b9e482b844729747d008e5de4f516dde.tar.bz2 | |
Fix build with GYP_DEFINES=use_openssl=1.
BUG=none
TEST=build on linux with GYP_DEFINES=use_openssl=1.
Review URL: http://codereview.chromium.org/8159004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1bf2eabc..2cd76ba 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -39,6 +39,9 @@ # Whether or not we are building with the Aura window manager. 'use_aura%': 0, + + # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803 + 'use_openssl%': 0, }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', @@ -46,6 +49,7 @@ 'touchui%': '<(touchui)', 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', + 'use_openssl%': '<(use_openssl)', # Compute the architecture that we're building on. 'conditions': [ @@ -98,6 +102,7 @@ 'use_only_pure_views%': '<(use_only_pure_views)', 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', + 'use_openssl%': '<(use_openssl)', # We used to provide a variable for changing how libraries were built. # This variable remains until we can clean up all the users. @@ -252,12 +257,12 @@ }], # NSS usage. - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', { 'use_nss%': 1, }, { 'use_nss%': 0, }], - + # Flags to use X11 on non-Mac POSIX platforms ['OS=="win" or OS=="mac" or OS=="android"', { 'use_glib%': 0, @@ -335,6 +340,7 @@ 'use_only_pure_views%': '<(use_only_pure_views)', 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', + 'use_openssl%': '<(use_openssl)', 'use_nss%': '<(use_nss)', 'os_posix%': '<(os_posix)', 'use_glib%': '<(use_glib)', @@ -536,9 +542,6 @@ # whether to compile in the sources for the GPU plugin / process. 'enable_gpu%': 1, - # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803 - 'use_openssl%': 0, - # .gyp files or targets should set chromium_code to 1 if they build # Chromium-specific code, as opposed to external code. This variable is # used to control such things as the set of warnings to enable, and |