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

Unified Diff: build/common.gypi

Issue 138033023: Reenable linux_aura on the main builders. (Again). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/installer/linux/debian/expected_deps » ('j') | no next file with comments »
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 8cdf55629f111cb6b32ffa2dbedb909bfa5f50de..2b02fb951c4951f758c0dad6f6746dea9faa814e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -84,6 +84,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 | « no previous file | chrome/installer/linux/debian/expected_deps » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698