summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-05 01:01:32 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-05 01:01:32 +0000
commit2c858a85313b7a5b4144504ae2adf7e2a9663dec (patch)
tree6b9988117475c7c6fa44fb1e81770cf21851cc8d /build
parenta2d1e64a8699d2b103b2c239e1a5d47ba313c45c (diff)
downloadchromium_src-2c858a85313b7a5b4144504ae2adf7e2a9663dec.zip
chromium_src-2c858a85313b7a5b4144504ae2adf7e2a9663dec.tar.gz
chromium_src-2c858a85313b7a5b4144504ae2adf7e2a9663dec.tar.bz2
Force use_ash to 0 if use_aura is 0.
Also remove old Windows gyp workaround to enable Ash if use_aura on Windows (as it is now on by default). BUG=Using use_aura=0 on Windows doesn't compile as it tries to build Ash. Review URL: https://codereview.chromium.org/25665008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi15
1 files changed, 5 insertions, 10 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 78848e8..4487b19 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.
+ ['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,