Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index bf6732a82427bd93fb052a195e9ea90c883ad034..2fec6dd7c18cb1e62c0b5fea3683a8adf6549d4e 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -744,15 +744,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, |
@@ -1170,7 +1161,6 @@ |
'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)', |
@@ -2139,9 +2129,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'], |
}], |
@@ -3075,15 +3062,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', |
], |
}], |
@@ -3093,9 +3076,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'], |
}], |