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

Unified Diff: build/common.gypi

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 609422e88817cfdebfad6c9d8be0b372aee15f2a..c60f4528c7694ee886fd780af93b09e0ce1f94e2 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)',
@@ -744,15 +736,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,
@@ -1167,10 +1150,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)',
@@ -2139,9 +2120,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'],
}],
@@ -3069,15 +3047,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',
],
}],
@@ -3087,9 +3061,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'],
}],

Powered by Google App Engine
This is Rietveld 408576698