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

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

Issue 16385004: Revert 205054 "Revert 204716 " (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 205073)
+++ trunk/src/build/common.gypi (working copy)
@@ -65,12 +65,12 @@
'branding%': 'Chromium',
'conditions': [
- # ChromeOS implies ash and for a limited time Windows. Call now!.
- ['chromeos==1 or OS=="win"', {
+ # ChromeOS implies ash.
+ ['chromeos==1', {
'use_ash%': 1,
'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.
« 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