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

Unified Diff: build/common.gypi

Issue 1085923002: Rename use_nss to use_nss_certs in gyp and grit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrapping Created 5 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
« no previous file with comments | « no previous file | build/secondary/tools/grit/grit_rule.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index e14d9333a5543633e41f2e5580a8c394af16cc31..bddcac9a25545bfaf3aca5f4c67bf3571ba7aaef 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -682,8 +682,14 @@
# NSS usage.
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', {
+ 'use_nss_certs%': 1,
+ # TODO(davidben): use_nss is deprecated and will be removed. See
+ # https://crbug.com/462040.
'use_nss%': 1,
}, {
+ 'use_nss_certs%': 0,
+ # TODO(davidben): use_nss is deprecated and will be removed. See
+ # https://crbug.com/462040.
'use_nss%': 0,
}],
@@ -1086,6 +1092,7 @@
'use_openssl%': '<(use_openssl)',
'use_openssl_certs%': '<(use_openssl_certs)',
'use_nss%': '<(use_nss)',
+ 'use_nss_certs%': '<(use_nss_certs)',
'use_udev%': '<(use_udev)',
'os_bsd%': '<(os_bsd)',
'os_posix%': '<(os_posix)',
@@ -2030,8 +2037,8 @@
['use_ash==1', {
'grit_defines': ['-D', 'use_ash'],
}],
- ['use_nss==1', {
- 'grit_defines': ['-D', 'use_nss'],
+ ['use_nss_certs==1', {
+ 'grit_defines': ['-D', 'use_nss_certs'],
}],
['use_ozone==1', {
'grit_defines': ['-D', 'use_ozone'],
@@ -2997,7 +3004,8 @@
['<(use_glib)==1 and >(nacl_untrusted_build)==0', {
'defines': ['USE_GLIB=1'],
}],
- ['<(use_nss)==1 and >(nacl_untrusted_build)==0', {
+ ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
+ # TODO(davidben): Rename this to USE_NSS_CERTS. https://crbug.com/462040
'defines': ['USE_NSS=1'],
}],
['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
« no previous file with comments | « no previous file | build/secondary/tools/grit/grit_rule.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698