| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index db2739cbd36cab64fcf150744b71392dad12f93d..dd3dcd700da2df76672cd6666d4ee2b07b65f876 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -64,12 +64,6 @@
|
| # Use the PCI lib to collect GPU information.
|
| 'use_libpci%': 1,
|
|
|
| - # Use OpenSSL instead of NSS as the underlying SSL and crypto
|
| - # implementation. Certificate verification will in most cases be
|
| - # handled by the OS. If OpenSSL's struct X509 is used to represent
|
| - # certificates, use_openssl_certs must be set.
|
| - 'use_openssl%': 1,
|
| -
|
| # Use OpenSSL for representing certificates. When targeting Android,
|
| # the platform certificate library is used for certificate
|
| # verification. On other targets, this flag also enables OpenSSL for
|
| @@ -168,7 +162,6 @@
|
| 'use_ozone%': '<(use_ozone)',
|
| 'embedded%': '<(embedded)',
|
| 'use_libpci%': '<(use_libpci)',
|
| - 'use_openssl%': '<(use_openssl)',
|
| 'use_openssl_certs%': '<(use_openssl_certs)',
|
| 'enable_viewport%': '<(enable_viewport)',
|
| 'enable_hidpi%': '<(enable_hidpi)',
|
| @@ -355,7 +348,6 @@
|
| 'use_ozone_evdev%': '<(use_ozone_evdev)',
|
| 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
|
| 'embedded%': '<(embedded)',
|
| - 'use_openssl%': '<(use_openssl)',
|
| 'use_openssl_certs%': '<(use_openssl_certs)',
|
| 'enable_viewport%': '<(enable_viewport)',
|
| 'enable_hidpi%': '<(enable_hidpi)',
|
| @@ -738,15 +730,6 @@
|
| 'use_nss_certs%': 0,
|
| }],
|
|
|
| - # NSS verifier usage.
|
| - # On non-OpenSSL iOS configurations, certificates use the operating
|
| - # system library, but the verifier uses the bundled copy of NSS.
|
| - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") or (OS=="ios" and use_openssl==0)', {
|
| - 'use_nss_verifier%': 1,
|
| - }, {
|
| - 'use_nss_verifier%': 0,
|
| - }],
|
| -
|
| # libudev usage. This currently only affects the content layer.
|
| ['OS=="linux" and embedded==0', {
|
| 'use_udev%': 1,
|
| @@ -1161,10 +1144,8 @@
|
| 'use_ash%': '<(use_ash)',
|
| 'use_cras%': '<(use_cras)',
|
| 'use_libpci%': '<(use_libpci)',
|
| - 'use_openssl%': '<(use_openssl)',
|
| 'use_openssl_certs%': '<(use_openssl_certs)',
|
| 'use_nss_certs%': '<(use_nss_certs)',
|
| - 'use_nss_verifier%': '<(use_nss_verifier)',
|
| 'use_udev%': '<(use_udev)',
|
| 'os_bsd%': '<(os_bsd)',
|
| 'os_posix%': '<(os_posix)',
|
| @@ -2131,9 +2112,6 @@
|
| ['use_nss_certs==1', {
|
| 'grit_defines': ['-D', 'use_nss_certs'],
|
| }],
|
| - ['use_nss_verifier==1', {
|
| - 'grit_defines': ['-D', 'use_nss_verifier'],
|
| - }],
|
| ['use_ozone==1', {
|
| 'grit_defines': ['-D', 'use_ozone'],
|
| }],
|
| @@ -3060,15 +3038,11 @@
|
| ['<(use_libpci)==1', {
|
| 'defines': ['USE_LIBPCI=1'],
|
| }],
|
| - ['<(use_openssl)==1', {
|
| - 'defines': ['USE_OPENSSL=1'],
|
| - }],
|
| ['<(use_openssl_certs)==1', {
|
| 'defines': ['USE_OPENSSL_CERTS=1'],
|
| }],
|
| ['>(nacl_untrusted_build)==1', {
|
| 'defines': [
|
| - 'USE_OPENSSL=1',
|
| 'USE_OPENSSL_CERTS=1',
|
| ],
|
| }],
|
| @@ -3078,9 +3052,6 @@
|
| ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
|
| 'defines': ['USE_NSS_CERTS=1'],
|
| }],
|
| - ['<(use_nss_verifier)==1 and >(nacl_untrusted_build)==0', {
|
| - 'defines': ['USE_NSS_VERIFIER=1'],
|
| - }],
|
| ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
|
| 'defines': ['OS_CHROMEOS=1'],
|
| }],
|
|
|