diff options
| -rw-r--r-- | DEPS | 48 | ||||
| -rw-r--r-- | build/common.gypi | 28 |
2 files changed, 73 insertions, 3 deletions
@@ -54,6 +54,10 @@ vars = { # the commit queue can handle CLs rolling openssl # and whatever else without interference from each other. "ios_webkit_revision": "147503", + + # Destination for Debian sysroots for Official builds. + "linux_sysroot_dir": + "src/chrome/installer/linux/internal/sysroot_scripts/", } deps = { @@ -644,6 +648,50 @@ hooks = [ "--linux-only"], }, { + # Downloads the Debian Wheezy amd64 sysroot to + # chrome/installer/linux/internal/debian_wheezy_amd64-sysroot. + # This sysroot updates at about the same rate that the chrome build deps + # change. + # This script is a no-op except for linux users who have the following in + # their GYP_DEFINES: + # + # * branding=Chrome + # * buildtype=Official + # * target_arch=x64 + # + # and not: + # + # * chromeos=1 + # + "pattern": ".", + "action": ["python", + Var("linux_sysroot_dir") + "install-debian.wheezy.sysroot.py", + "--arch=amd64", + "--linux-only"], + }, + { + # Downloads the Debian Wheezy i386 sysroot to + # chrome/installer/linux/internal/debian_wheezy_i386-sysroot. + # This sysroot updates at about the same rate that the chrome build deps + # change. + # This script is a no-op except for linux users who have the following in + # their GYP_DEFINES: + # + # * branding=Chrome + # * buildtype=Official + # * target_arch=ia32 + # + # and not: + # + # * chromeos=1 + # + "pattern": ".", + "action": ["python", + Var("linux_sysroot_dir") + "install-debian.wheezy.sysroot.py", + "--arch=i386", + "--linux-only"], + }, + { # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes # zero seconds to run. If something changed, it downloads a prebuilt clang, # which takes ~20s, but clang speeds up builds by more than 20s. 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', |