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

Unified Diff: build/common.gypi

Issue 8135024: Make use_nss a gyp var so that aura can build w/ nss. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review corrections Created 9 years, 2 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 | « build/build_config.h ('k') | chrome/chrome_browser.gypi » ('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 17d707f8a383fe493bab72c7902953cf5e6d2479..1bf2eabc59adab87ef0de7da2250babcbac19ce8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -251,6 +251,13 @@
'os_posix%': 1,
}],
+ # NSS usage.
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+ '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,
@@ -328,6 +335,7 @@
'use_only_pure_views%': '<(use_only_pure_views)',
'views_compositor%': '<(views_compositor)',
'use_aura%': '<(use_aura)',
+ 'use_nss%': '<(use_nss)',
'os_posix%': '<(os_posix)',
'use_glib%': '<(use_glib)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
@@ -770,6 +778,9 @@
['use_aura==1', {
'grit_defines': ['-D', 'use_aura'],
}],
+ ['use_nss==1', {
+ 'grit_defines': ['-D', 'use_nss'],
+ }],
['touchui==1', {
'grit_defines': ['-D', 'touchui'],
}],
@@ -904,6 +915,9 @@
['use_aura==1', {
'defines': ['USE_AURA=1'],
}],
+ ['use_nss==1', {
+ 'defines': ['USE_NSS=1'],
+ }],
['toolkit_uses_gtk==1', {
'defines': ['TOOLKIT_USES_GTK=1'],
}],
« no previous file with comments | « build/build_config.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698