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

Unified Diff: build/common.gypi

Issue 25665008: Force use_ash to 0 if use_aura is 0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one layer lower... Created 7 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 | « 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
diff --git a/build/common.gypi b/build/common.gypi
index f9d2ca0ad8be559af01149becf8be2db7a505f89..98e17766f3c62e2e6cf383b2fc0346e4d0b0beab 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -75,16 +75,6 @@
'use_aura%': 1,
}],
- # For now, Windows builds that |use_aura| should also imply using
- # ash. This rule should be removed for the future when Windows is
- # using the aura windows without the ash interface.
- ['use_aura==1 and OS=="win"', {
- 'use_ash%': 1,
- }],
- ['use_ash==1', {
- 'use_aura%': 1,
- }],
-
# Whether we're a traditional desktop unix.
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
'desktop_linux%': 1,
@@ -137,6 +127,11 @@
'arm_version%': 7,
'conditions': [
+ # Ash needs Aura.
gab 2013/10/04 17:54:15 So it actually looks like the first block above de
scottmg 2013/10/04 18:20:31 Yeah, that's what I was trying to say before. Craz
+ ['use_aura==0', {
+ 'use_ash%': 0,
+ }],
+
# Set default value of toolkit_views based on OS.
['OS=="win" or chromeos==1 or use_aura==1', {
'toolkit_views%': 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