diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 05:46:42 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 05:46:42 +0000 |
| commit | 42972b69e719f3d161811c2aeefc4977393ded70 (patch) | |
| tree | 32ff82acbd1a291d6f81f1a030bbbc521a34a952 /build/common.gypi | |
| parent | 0212492e92f5b266c4d0154593d8eb3f00e4302a (diff) | |
| download | chromium_src-42972b69e719f3d161811c2aeefc4977393ded70.zip chromium_src-42972b69e719f3d161811c2aeefc4977393ded70.tar.gz chromium_src-42972b69e719f3d161811c2aeefc4977393ded70.tar.bz2 | |
Linux: Remove check for Ubuntu 12.04 for official Chrome builds.
BUG=170262
Review URL: https://chromiumcodereview.appspot.com/23469006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/build/common.gypi b/build/common.gypi index 9920192..a13bc6f 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -165,14 +165,6 @@ }, { '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 ], }, @@ -197,7 +189,6 @@ 'buildtype%': '<(buildtype)', 'branding%': '<(branding)', 'arm_version%': '<(arm_version)', - '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 @@ -674,7 +665,8 @@ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', }], # OS=="linux" and target_arch=="arm" and chromeos==0 - ['linux_lsb_release=="12.04"', { + + ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', { 'conditions': [ ['target_arch=="x64"', { 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_amd64-sysroot', @@ -683,7 +675,7 @@ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_i386-sysroot', }], ], - }], # linux_lsb_release=="12.04" + }], # OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0 ['OS=="linux" and target_arch=="mipsel"', { 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', |