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

Unified Diff: build/common.gypi

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month 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/browser/apps/app_browsertest.cc » ('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 bf4a6808eddd32424e3447e67f817782d23f32a5..01078b9384fc21099918f1ac35a977ed4c167e81 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -76,6 +76,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/browser/apps/app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698