Commit e2aaaacc authored by thestig@chromium.org's avatar thestig@chromium.org

Use a sysroot for Chrome Linux official builds. (try 2)

BUG=224487
R=mmoss@google.com

Review URL: https://codereview.chromium.org/15030002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198856 0039d316-1c4b-4281-b951-d872f2087c98
parent dcadc801
...@@ -643,6 +643,14 @@ hooks = [ ...@@ -643,6 +643,14 @@ hooks = [
"action": ["python", "src/build/linux/install-arm-sysroot.py", "action": ["python", "src/build/linux/install-arm-sysroot.py",
"--linux-only"], "--linux-only"],
}, },
{
# Downloads the Debian Wheezy sysroot to chrome/installer/linux/internal
# if needed. 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
# src-internal access and are doing official chrome builds.
"pattern": ".",
"action": ["src/build/linux/install-debian.wheezy.sysroot.wrapper.sh"],
},
{ {
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes # 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, # zero seconds to run. If something changed, it downloads a prebuilt clang,
......
...@@ -61,6 +61,9 @@ ...@@ -61,6 +61,9 @@
# non-Official # builds). # non-Official # builds).
'buildtype%': 'Dev', 'buildtype%': 'Dev',
# Override branding to select the desired branding flavor.
'branding%': 'Chromium',
'conditions': [ 'conditions': [
# ChromeOS implies ash. # ChromeOS implies ash.
['chromeos==1', { ['chromeos==1', {
...@@ -101,6 +104,7 @@ ...@@ -101,6 +104,7 @@
'enable_hidpi%': '<(enable_hidpi)', 'enable_hidpi%': '<(enable_hidpi)',
'enable_touch_ui%': '<(enable_touch_ui)', 'enable_touch_ui%': '<(enable_touch_ui)',
'buildtype%': '<(buildtype)', 'buildtype%': '<(buildtype)',
'branding%': '<(branding)',
'host_arch%': '<(host_arch)', 'host_arch%': '<(host_arch)',
# Default architecture we're building for is the architecture we're # Default architecture we're building for is the architecture we're
...@@ -168,6 +172,14 @@ ...@@ -168,6 +172,14 @@
}, { }, {
'use_default_render_theme%': 0, '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 @@ ...@@ -191,10 +203,9 @@
'enable_message_center%': '<(enable_message_center)', 'enable_message_center%': '<(enable_message_center)',
'use_default_render_theme%': '<(use_default_render_theme)', 'use_default_render_theme%': '<(use_default_render_theme)',
'buildtype%': '<(buildtype)', 'buildtype%': '<(buildtype)',
'branding%': '<(branding)',
'arm_version%': '<(arm_version)', 'arm_version%': '<(arm_version)',
'linux_lsb_release%': '<(linux_lsb_release)',
# Override branding to select the desired branding flavor.
'branding%': 'Chromium',
# Set to 1 to enable fast builds. Set to 2 for even faster builds # Set to 1 to enable fast builds. Set to 2 for even faster builds
# (it disables debug info for fastest compilation - only for use # (it disables debug info for fastest compilation - only for use
...@@ -629,6 +640,17 @@ ...@@ -629,6 +640,17 @@
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
}], # OS=="linux" and target_arch=="arm" and chromeos==0 }], # 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_wheezy_i386-sysroot',
}],
],
}], # linux_lsb_release=="12.04"
['target_arch=="mipsel"', { ['target_arch=="mipsel"', {
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot',
'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu-gcc', 'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu-gcc',
......
#!/bin/sh
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# This wrapper script runs the Debian sysroot installation scripts, if they
# exist.
#
# The script is a no-op except for linux users who have the following in their
# GYP_DEFINES:
#
# * branding=Chrome
# * buildtype=Official
# * target_arch=[matching_arch]
#
# and not:
#
# * chromeos=1
set -e
SRC_DIR="$(dirname "$0")/../../"
SCRIPT_DIR="chrome/installer/linux/internal/sysroot_scripts/"
SCRIPT_FILE="$SRC_DIR/$SCRIPT_DIR/install-debian.wheezy.sysroot.py"
if [ -e "$SCRIPT_FILE" ]; then
python "$SCRIPT_FILE" --linux-only --arch=amd64
python "$SCRIPT_FILE" --linux-only --arch=i386
fi
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment