diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 22:14:38 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 22:14:38 +0000 |
| commit | a74321b4c45c0b06ec1e6a00712c902614b8289c (patch) | |
| tree | fca23d3598c8c322144fab972eff5e12ca599401 /native_client_sdk | |
| parent | eb370fc0fba62ea44db5c35514fb3223523928cc (diff) | |
| download | chromium_src-a74321b4c45c0b06ec1e6a00712c902614b8289c.zip chromium_src-a74321b4c45c0b06ec1e6a00712c902614b8289c.tar.gz chromium_src-a74321b4c45c0b06ec1e6a00712c902614b8289c.tar.bz2 | |
Re-run gclient runhooks for arm on the sdk builders.
The SDK builders invoke gyp for arm, but never run gclient with GYP_DEFINES
set. Unfortunately, some runhooks look for target_arch=arm in order to decide
when to install arm specific tools.
Adding a step that re-runs runhooks for arm.
BUG=None
TEST=None
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/208853002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/buildbot_run.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py index a392e55..a19618f 100755 --- a/native_client_sdk/src/build_tools/buildbot_run.py +++ b/native_client_sdk/src/build_tools/buildbot_run.py @@ -23,6 +23,17 @@ from build_paths import SRC_DIR, SDK_SRC_DIR, SCRIPT_DIR import getos +def StepArmRunHooks(): + if getos.GetPlatform() != 'linux': + return + # Run 'gclient runhooks' for arm, as some arm specific tools are only + # installed in that case. + buildbot_common.BuildStep('gclient runhooks for arm') + env = dict(os.environ) + env['GYP_DEFINES'] = 'target_arch=arm' + Run(['gclient', 'runhooks'], env=env, cwd=SDK_SRC_DIR) + + def StepRunUnittests(): buildbot_common.BuildStep('Run unittests') @@ -93,6 +104,7 @@ def main(args): if os.getenv('BUILDBOT_BUILDERNAME', '').endswith('build'): options.build_only = True + StepArmRunHooks() StepRunUnittests() StepBuildSDK() if not options.build_only: |