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

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 win64 compile. Created 6 years, 8 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/host/ash_window_tree_host_x11_unittest.cc ('k') | chrome/app/theme/theme_resources.grd » ('j') | chrome/browser/fullscreen_aurax11.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 e94ed2c8bdd7b9051dd05172a1c897765b699e28..13452c55e5d16c87cfefbcf7911b35945be57b4e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -87,7 +87,7 @@
'conditions': [
# ChromeOS and Windows use Aura and Ash.
- ['chromeos==1 or OS=="win"', {
+ ['chromeos==1 or OS=="win" or OS=="linux"', {
'use_ash%': 1,
sky 2014/04/24 23:14:32 Can we get rid of use_ash now?
Elliot Glaysher 2014/05/12 21:35:42 Theoretically yes, but I'd prefer to not do it in
'use_aura%': 1,
}],
@@ -97,14 +97,6 @@
'use_aura%': 1,
}],
- # ToT Linux should be aura.
- #
- # TODO(erg): Merge this into the previous block once compiling with
- # aura safely implies including ash capabilities.
- ['OS=="linux"', {
- '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,
« no previous file with comments | « ash/host/ash_window_tree_host_x11_unittest.cc ('k') | chrome/app/theme/theme_resources.grd » ('j') | chrome/browser/fullscreen_aurax11.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698