From 1a367702869e3c71191f442f3b625b05002a257c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 7 Apr 2015 23:40:36 +0800
Subject: [PATCH] Only build static_library version of libchromiumcontent in CI

---
 script/bootstrap.py | 12 ++++++++----
 script/cibuild      |  4 ++--
 vendor/brightray    |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/script/bootstrap.py b/script/bootstrap.py
index fadc7a2..caf23ed 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -28,7 +28,7 @@ def main():
     update_win32_python()
   update_submodules()
   update_node_modules('.')
-  bootstrap_brightray(args.url)
+  bootstrap_brightray(args.dev, args.url)
 
   create_chrome_version_h()
   touch_config_gypi()
@@ -47,6 +47,8 @@ def parse_args():
   parser.add_argument('-v', '--verbose',
                       action='store_true',
                       help='Prints the output of the subprocesses')
+  parser.add_argument('-d', '--dev', action='store_true',
+                      help='Do not download static_library build')
   parser.add_argument('-y', '--yes', '--assume-yes',
                       action='store_true',
                       help='Run non-interactively by assuming "yes" to all ' \
@@ -66,10 +68,12 @@ def update_submodules():
   execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
 
 
-def bootstrap_brightray(url):
+def bootstrap_brightray(is_dev, url):
   bootstrap = os.path.join(VENDOR_DIR, 'brightray', 'script', 'bootstrap')
-  execute_stdout([sys.executable, bootstrap, '--commit',
-                  LIBCHROMIUMCONTENT_COMMIT, url])
+  args = ['--commit', LIBCHROMIUMCONTENT_COMMIT, url]
+  if is_dev:
+    args = ['--dev'] + args
+  execute_stdout([sys.executable, bootstrap] + args)
 
 
 def update_node_modules(dirname):
diff --git a/script/cibuild b/script/cibuild
index b71a199..264e123 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -43,10 +43,10 @@ def main():
   if is_travis and sys.platform == 'linux2':
     with scoped_env('CXX', 'g++'):
       with scoped_env('CC', 'gcc'):
-        run_script('bootstrap.py')
+        run_script('bootstrap.py', ['-v', '--dev'])
     run_script('update.py')
   else:
-    run_script('bootstrap.py')
+    run_script('bootstrap.py', ['-v', '--dev'])
 
   run_script('cpplint.py')
   if sys.platform != 'win32':
diff --git a/vendor/brightray b/vendor/brightray
index 616ce90..e1304ed 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 616ce9051fef9896651686aa9a0b6403caa4e1a8
+Subproject commit e1304edb03ac774d1386be19bcced0822aabbc70
-- 
2.7.4