diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 21:34:06 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 21:34:06 +0000 |
| commit | 5f887613876aa1854a3cf66a857e96b9870b2cf6 (patch) | |
| tree | 9d43dc158a4d89574d2f9a140be747a1dc4e3a36 /build/common.gypi | |
| parent | 5477d890353c732bbd0c16d8a3c5ce56a52ee2fe (diff) | |
| download | chromium_src-5f887613876aa1854a3cf66a857e96b9870b2cf6.zip chromium_src-5f887613876aa1854a3cf66a857e96b9870b2cf6.tar.gz chromium_src-5f887613876aa1854a3cf66a857e96b9870b2cf6.tar.bz2 | |
Aura: Build on the linux desktop, plus add USE_ASH.
BUG=none
Review URL: http://codereview.chromium.org/9478015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index 60bd6df..82b2bc0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -71,11 +71,20 @@ '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")', }], - # Ash and ChromeOS require Aura. - ['(use_ash==1 or chromeos==1) and chromeos_gtk==0', { + # Non-GTK Chromeos implies ash. + ['chromeos==1', { + 'use_ash%': 1, 'use_aura%': 1, }], + # For now, Windows *AND* Linux builds that |use_aura| should also + # imply using ash. This rule should be removed for the future when + # both Linux and Windows are using the aura windows without the ash + # interface. + ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', { + 'use_ash%': 1, + }], + # Set default value of toolkit_views based on OS. ['OS=="win" or chromeos==1 or chromeos_gtk==1 or use_aura==1', { 'toolkit_views%': 1, @@ -356,18 +365,13 @@ 'enable_flapper_hacks%': 0, }], - # Enable file manager extension on Chrome OS or Aura. - ['chromeos==1 or use_aura==1', { + # Enable file manager extension on Chrome OS. + ['chromeos==1', { 'file_manager_extension%': 1, }, { 'file_manager_extension%': 0, }], - # ... except on Windows even with Aura. - ['use_aura==1 and OS=="win"', { - 'file_manager_extension%': 0, - }], - ['OS=="android"', { 'proprietary_codecs%': 1, 'enable_webrtc%': 0, |