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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos link 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 | « ash/root_window_controller.h ('k') | chrome/browser/fullscreen_aura.cc » ('j') | chrome/browser/fullscreen_aura.cc » ('J')
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 0be30b81f7c3fbd1c0f8ce4d120c0b4377ed1cc1..aa1aeb39ea633a4330ca00d590f34cbd2f418412 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -78,7 +78,7 @@
# 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_aura==1 and (OS=="win" or OS=="linux")', {
'use_ash%': 1,
}],
['use_ash==1', {
« no previous file with comments | « ash/root_window_controller.h ('k') | chrome/browser/fullscreen_aura.cc » ('j') | chrome/browser/fullscreen_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698