From 2347f24950edf847c801d3cece14150ea0d74e9c Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Tue, 20 May 2014 19:23:58 +0000 Subject: [PATCH] linux_aura: Compile ash into chrome. [This is take three. I believe that I've now fixed all the static initializers (including both files named debug_utils.cc that were including ), the packaging failures, and the black border on the app list as pointed out by mgiuca@.] Running chrome with the "--open-ash" parameter will create an ash desktop window. Ash on Linux has some problems, but at least we're now compiling the code into the binary. TODO: The applist isn't positioned correctly, and some details of the system tray aren't correct. BUG=300084, 303862 TBR=sky@chromium.org First Review URL: https://codereview.chromium.org/25108005 Review URL: https://codereview.chromium.org/292443002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@271725 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/common.gypi b/common.gypi index 6ab9f69dd..c5a8f40f1 100644 --- a/common.gypi +++ b/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, '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,