From 57262dd5efe7bf270f47516b225945ea53aa4e99 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 2 Jul 2015 04:42:36 +0000 Subject: [PATCH] Install arm build dependencies --- script/cibuild | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/script/cibuild b/script/cibuild index 2b7149db08aa..f44bf61f5405 100755 --- a/script/cibuild +++ b/script/cibuild @@ -19,15 +19,28 @@ LINUX_DEPS = [ 'g++-multilib', ] +LINUX_ARM_DEPS = [ + 'libc6-dev-armhf-cross', + 'linux-libc-dev-armhf-cross', + 'g++-arm-linux-gnueabihf', +] + def main(): os.environ['CI'] = '1' + target_arch = 'x64' + if os.environ.has_key('TARGET_ARCH'): + target_arch = os.environ['TARGET_ARCH'] + is_travis = (os.getenv('TRAVIS') == 'true') if is_travis and sys.platform == 'linux2': print 'Setup travis CI' execute(['sudo', 'apt-get', 'update']) - execute(['sudo', 'apt-get', 'install'] + LINUX_DEPS) + deps = LINUX_DEPS + if target_arch == 'arm': + deps += LINUX_ARM_DEPS + execute(['sudo', 'apt-get', 'install'] + deps) os.environ['DISPLAY'] = ':99.0' execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) @@ -40,10 +53,6 @@ def main(): rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download', 'libchromiumcontent')) - target_arch = 'x64' - if os.environ.has_key('TARGET_ARCH'): - target_arch = os.environ['TARGET_ARCH'] - run_script('bootstrap.py', ['--dev', '--target_arch=' + target_arch]) run_script('cpplint.py')