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

Unified Diff: trunk/src/build/common.gypi

Issue 23796008: Revert 222971 "Switch all windows bots to Aura" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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: trunk/src/build/common.gypi
===================================================================
--- trunk/src/build/common.gypi (revision 222982)
+++ trunk/src/build/common.gypi (working copy)
@@ -69,15 +69,10 @@
'branding%': 'Chromium',
'conditions': [
- # ChromeOS implies ash and Windows implies Ash and Aura.
- # However, we only default use_ash to 1 on Windows if
- # use_aura==1, so that disabling Aura automatically
- # disables Ash. See comments below, as well.
- ['chromeos==1 or OS=="win"', {
- 'use_aura%': 1,
- }],
+ # ChromeOS implies ash.
['chromeos==1', {
'use_ash%': 1,
+ 'use_aura%': 1,
}],
# For now, Windows builds that |use_aura| should also imply using
« 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