diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 05:36:07 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 05:36:07 +0000 |
| commit | 3d2497cba6cc9104a972439db9d0c3fe9079e1ad (patch) | |
| tree | 0e367d937473fa9ad55cc95c97f852f48f01849c /build | |
| parent | 636075a7fab4ec832b1f34a6e0f70f6900085a9f (diff) | |
| download | chromium_src-3d2497cba6cc9104a972439db9d0c3fe9079e1ad.zip chromium_src-3d2497cba6cc9104a972439db9d0c3fe9079e1ad.tar.gz chromium_src-3d2497cba6cc9104a972439db9d0c3fe9079e1ad.tar.bz2 | |
Use a sysroot for Chrome Linux official builds.
BUG=224487
R=mmoss@google.com
Review URL: https://codereview.chromium.org/12938016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0ebc85b..a513450 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -61,6 +61,9 @@ # non-Official # builds). 'buildtype%': 'Dev', + # Override branding to select the desired branding flavor. + 'branding%': 'Chromium', + 'conditions': [ # ChromeOS implies ash. ['chromeos==1', { @@ -101,6 +104,7 @@ 'enable_hidpi%': '<(enable_hidpi)', 'enable_touch_ui%': '<(enable_touch_ui)', 'buildtype%': '<(buildtype)', + 'branding%': '<(branding)', 'host_arch%': '<(host_arch)', # Default architecture we're building for is the architecture we're @@ -168,6 +172,14 @@ }, { 'use_default_render_theme%': 0, }], + + # TODO(thestig) Remove the linux_lsb_release check after all the + # official Ubuntu Lucid builder are gone. + ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', { + 'linux_lsb_release%': '<!(lsb_release -r -s)', + }, { + 'linux_lsb_release%': '', + }], # OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0 ], }, @@ -191,10 +203,9 @@ 'enable_message_center%': '<(enable_message_center)', 'use_default_render_theme%': '<(use_default_render_theme)', 'buildtype%': '<(buildtype)', + 'branding%': '<(branding)', 'arm_version%': '<(arm_version)', - - # Override branding to select the desired branding flavor. - 'branding%': 'Chromium', + 'linux_lsb_release%': '<(linux_lsb_release)', # Set to 1 to enable fast builds. Set to 2 for even faster builds # (it disables debug info for fastest compilation - only for use @@ -629,6 +640,17 @@ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', }], # OS=="linux" and target_arch=="arm" and chromeos==0 + ['linux_lsb_release=="12.04"', { + 'conditions': [ + ['target_arch=="x64"', { + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_amd64-sysroot', + }], + ['target_arch=="ia32"', { + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy32-sysroot', + }], + ], + }], # linux_lsb_release=="12.04" + ['target_arch=="mipsel"', { 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', 'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu-gcc', |