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

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: Remove Accidental change 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 77047a11f307bae7077bf5eb3818b0c19de087fa..dd7671acf079755fea57bbb45dfc3a3cd7734287 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -79,6 +79,11 @@
['use_aura==1 or touchui==1', {
'views_compositor%': 1,
}],
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="android"', {
mattm 2011/10/05 02:27:51 android shouldn't be in this list (in the conditio
mattm 2011/10/05 02:27:51 I'm not sure I understand the gyp stuff that requi
+ 'use_nss%': 1,
+ }, {
+ 'use_nss%': 0,
+ }],
],
},
@@ -90,6 +95,7 @@
'use_only_pure_views%': '<(use_only_pure_views)',
'views_compositor%': '<(views_compositor)',
'use_aura%': '<(use_aura)',
+ 'use_nss%': '<(use_nss)',
mattm 2011/10/05 02:27:51 And this could probably go next to use_openssl?
# We used to provide a variable for changing how libraries were built.
# This variable remains until we can clean up all the users.
@@ -320,6 +326,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)',
@@ -761,6 +768,9 @@
['use_aura==1', {
'grit_defines': ['-D', 'use_aura'],
}],
+ ['use_nss==1', {
+ 'grit_defines': ['-D', 'use_nss'],
+ }],
['touchui==1', {
'grit_defines': ['-D', 'touchui'],
}],
@@ -892,6 +902,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') | chrome/chrome_browser.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698