bin/sync-and-gyp: pass --deps='...' to `gclient sync`.

bin/sync-and-gyp

Index: bin/sync-and-gyp
diff --git a/bin/sync-and-gyp b/bin/sync-and-gyp
index 906b7671ba6850eb48ae7723c804c70eeb32065a..2a5aa5b5f2388ac079b146c594b5daee74cef4c5 100755
--- a/bin/sync-and-gyp
+++ b/bin/sync-and-gyp
@@ -23,14 +23,21 @@
 #
 #   python bin/sync-and-gyp
 
+# To retreive and use all optional deps:
+#
+#   python bin/sync-and-gyp --deps=all
+#   ninja -C out/Debug && out/Debug/dm
+
 import fnmatch
 import hashlib
-import subprocess
 import os
+import subprocess
 import sys
 
 skia_dir = os.path.join(os.path.dirname(__file__), os.pardir)
 
+skia_opt_deps = [arg for arg in sys.argv[1:] if arg.startswith('--deps=')]
+
 skia_out = os.environ.get("SKIA_OUT")
 if skia_out:
   skia_out = os.path.abspath(skia_out)
@@ -47,6 +54,7 @@ if not os.path.isfile('DEPS'):
 deps_hasher = hashlib.sha1()
 with open('DEPS', 'r') as f:
   deps_hasher.update(f.read())
+deps_hasher.update(repr(skia_opt_deps))
 deps_hash = deps_hasher.hexdigest()
 current_deps_hash = None
 if os.path.isfile('.deps_sha1'):
@@ -71,8 +79,10 @@ if current_deps_hash != deps_hash:
   if not os.path.isfile('.gclient'):
     with open('.gclient', 'w') as o:
       o.write(default_gclient_config)
+  gclient_sync_command = ['gclient', 'sync'] + skia_opt_deps
   try:
-    subprocess.check_call(['gclient', 'sync'])
+    sys.stdout.write(' '.join(gclient_sync_command) + '\n')

[mtklein, 2016/02/17 15:18:39]

Might be nicer to print just gclient_sync_command, so we can see where word
breaks go.   Lots of things go weird with word breaks on command lines.

+    subprocess.check_call(gclient_sync_command)
   except:
     sys.stderr.write('\n`gclient sync` failed.\n')
     os.remove('.deps_sha1')  # Unknown state.