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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/ash/host/ash_window_tree_host_x11_unittest.cc ('k') | trunk/src/chrome/app/theme/theme_resources.grd » ('j') | 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 269901)
+++ trunk/src/build/common.gypi (working copy)
@@ -87,7 +87,7 @@
'conditions': [
# ChromeOS and Windows use Aura and Ash.
- ['chromeos==1 or OS=="win" or OS=="linux"', {
+ ['chromeos==1 or OS=="win"', {
'use_ash%': 1,
'use_aura%': 1,
}],
@@ -97,6 +97,14 @@
'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 | « trunk/src/ash/host/ash_window_tree_host_x11_unittest.cc ('k') | trunk/src/chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698