diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 01:23:11 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 01:23:11 +0000 |
| commit | 8796d92e4ae87d65f65a465630d0653d5fb263cf (patch) | |
| tree | 2a0b7b53376c332d7ba4860c9ac959d68ff5fca1 /build | |
| parent | 0c6a0813f3a3a8473391bc140fa557fe8b54f44c (diff) | |
| download | chromium_src-8796d92e4ae87d65f65a465630d0653d5fb263cf.zip chromium_src-8796d92e4ae87d65f65a465630d0653d5fb263cf.tar.gz chromium_src-8796d92e4ae87d65f65a465630d0653d5fb263cf.tar.bz2 | |
Upstream Android-specific strings.
BUG=136951
Review URL: https://chromiumcodereview.appspot.com/10824121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150217 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 74 |
1 files changed, 41 insertions, 33 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8fe839a..4b6cd7e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -17,17 +17,23 @@ 'variables': { 'variables': { 'variables': { - # Whether we're building a ChromeOS build. - 'chromeos%': 0, + 'variables': { + # Whether we're building a ChromeOS build. + 'chromeos%': 0, - # Whether we are using Views Toolkit - 'toolkit_views%': 0, + # Whether or not we are using the Aura windowing framework. + 'use_aura%': 0, - # Whether or not we are using the Aura windowing framework. - 'use_aura%': 0, + # Whether or not we are building the Ash shell. + 'use_ash%': 0, + }, + # Copy conditionally-set variables out one scope. + 'chromeos%': '<(chromeos)', + 'use_aura%': '<(use_aura)', + 'use_ash%': '<(use_ash)', - # Whether or not we are building the Ash shell. - 'use_ash%': 0, + # Whether we are using Views Toolkit + 'toolkit_views%': 0, # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803 'use_openssl%': 0, @@ -57,6 +63,24 @@ # based on 'buildtype' (i.e. we don't care about saving symbols for # non-Official # builds). 'buildtype%': 'Dev', + + 'conditions': [ + # ChromeOS implies ash. + ['chromeos==1', { + 'use_ash%': 1, + 'use_aura%': 1, + }], + + # For now, Windows builds that |use_aura| should also imply using + # ash. This rule should be removed for the future when Windows is + # using the aura windows without the ash interface. + ['use_aura==1 and OS=="win"', { + 'use_ash%': 1, + }], + ['use_ash==1', { + 'use_aura%': 1, + }], + ], }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', @@ -87,23 +111,6 @@ '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")', }], - # 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=="win"', { - 'use_ash%': 1, - }], - ['use_ash==1', { - 'use_aura%': 1, - }], - # Set default value of toolkit_views based on OS. ['OS=="win" or chromeos==1 or use_aura==1', { 'toolkit_views%': 1, @@ -111,6 +118,13 @@ 'toolkit_views%': 0, }], + # Set toolkit_uses_gtk for the Chromium browser on Linux. + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', { + 'toolkit_uses_gtk%': 1, + }, { + 'toolkit_uses_gtk%': 0, + }], + # Enable HiDPI on Mac OS. ['OS=="mac"', { 'enable_hidpi%': 1, @@ -127,6 +141,7 @@ 'chromeos%': '<(chromeos)', 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', + 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', 'use_openssl%': '<(use_openssl)', @@ -412,13 +427,6 @@ 'use_x11%': 1, }], - # Set toolkit_uses_gtk for the Chromium browser on Linux. - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', { - 'toolkit_uses_gtk%': 1, - }, { - 'toolkit_uses_gtk%': 0, - }], - # We always use skia text rendering in Aura on Windows, since GDI # doesn't agree with our BackingStore. # TODO(beng): remove once skia text rendering is on by default. @@ -436,7 +444,7 @@ 'use_gnome_keyring%': 1, }], - ['toolkit_views==0 or OS=="mac" or OS=="ios"', { + ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', { # GTK+, Mac and iOS want Title Case strings 'use_titlecase_in_grd_files%': 1, }], |