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

Unified Diff: build/common.gypi

Issue 12226031: Revert 180901 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 180901)
+++ build/common.gypi (working copy)
@@ -64,11 +64,11 @@
'use_aura%': 1,
}],
- # Temporarily turn on aura for windows to get perf numbers. Will
- # revert ASAP.
- ['OS=="win"', {
+ # 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_aura%': 1,
}],
['use_ash==1', {
'use_aura%': 1,
« no previous file with comments | « no previous file | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698