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

Unified Diff: build/common.gypi

Issue 9071013: Introduce use_ash macro/gyp define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 12 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 116141)
+++ build/common.gypi (working copy)
@@ -30,8 +30,11 @@
# Whether the compositor is enabled on views.
'views_compositor%': 0,
- # Whether or not we are building with the Aura window manager.
+ # Whether or not we are using the Aura windowing framework.
'use_aura%': 0,
+
+ # Whether or not we are building the Ash shell.
+ 'use_ash%': 0,
# Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
'use_openssl%': 0,
@@ -47,6 +50,7 @@
'chromeos%': '<(chromeos)',
'views_compositor%': '<(views_compositor)',
'use_aura%': '<(use_aura)',
+ 'use_ash%': '<(use_ash)',
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'use_skia_on_mac%': '<(use_skia_on_mac)',
@@ -62,6 +66,11 @@
'host_arch%':
'<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
}],
+
+ # Ash requires Aura.
+ ['use_ash==1', {
+ 'use_aura%': 1,
+ }],
# Set default value of toolkit_views based on OS.
['OS=="win" or chromeos==1 or use_aura==1', {
@@ -91,6 +100,7 @@
'views_compositor%': '<(views_compositor)',
'use_webkit_compositor%': '<(use_webkit_compositor)',
'use_aura%': '<(use_aura)',
+ 'use_ash%': '<(use_ash)',
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'use_skia_on_mac%': '<(use_skia_on_mac)',
@@ -357,6 +367,7 @@
'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
'use_webkit_compositor%': '<(use_webkit_compositor)',
'use_aura%': '<(use_aura)',
+ 'use_ash%': '<(use_ash)',
'use_openssl%': '<(use_openssl)',
'use_nss%': '<(use_nss)',
'os_bsd%': '<(os_bsd)',
@@ -835,6 +846,9 @@
['use_aura==1', {
'grit_defines': ['-D', 'use_aura'],
}],
+ ['use_ash==1', {
+ 'grit_defines': ['-D', 'use_ash'],
+ }],
['use_nss==1', {
'grit_defines': ['-D', 'use_nss'],
}],
@@ -1009,6 +1023,9 @@
['use_aura==1', {
'defines': ['USE_AURA=1'],
}],
+ ['use_ash==1', {
+ 'defines': ['USE_ASH=1'],
+ }],
['use_nss==1', {
'defines': ['USE_NSS=1'],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698