Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4647)

Unified Diff: build/common.gypi

Issue 23469006: Linux: Remove check for Ubuntu 12.04 for official Chrome builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 219246)
+++ build/common.gypi (working copy)
@@ -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
@@ -672,7 +663,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',
@@ -681,7 +673,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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698