Move VR test APK downloading behind an env var

third_party/gvr-android-sdk/test-apks/update.py

Index: third_party/gvr-android-sdk/test-apks/update.py
diff --git a/third_party/gvr-android-sdk/test-apks/update.py b/third_party/gvr-android-sdk/test-apks/update.py
new file mode 100644
index 0000000000000000000000000000000000000000..941f214aa088800177831324c3421bac8f0d52bc
--- /dev/null
+++ b/third_party/gvr-android-sdk/test-apks/update.py
@@ -0,0 +1,21 @@
+import os
+import subprocess
+import sys
+
+THIS_DIR = os.path.abspath(os.path.dirname(__file__))
+DAYDREAM_DIR = os.path.abspath(os.path.join(THIS_DIR, 'daydream_home'))
+VR_SERVICES_DIR = os.path.abspath(os.path.join(THIS_DIR, 'vr_services'))
+
+def main():
+  if 'DOWNLOAD_VR_TEST_APKS' not in os.environ:
+    return 0
+  print subprocess.check_output(['download_from_google_storage',

[Nico, 2017/03/03 15:51:59]

Use check_call instead of print check_output.

check_output redirects the default stdout to a pipe and reads from that to give
you the output as a string, which you then send to standard output. check_call
doesn't redirect standard output in the first place.

+                                '--bucket', 'chrome-vr-test-apks/daydream_home',
+                                '-d', DAYDREAM_DIR])
+  print subprocess.check_output(['download_from_google_storage',
+                                 '--bucket', 'chrome-vr-test-apks/vr_services',
+                                 '-d', VR_SERVICES_DIR])
+  return 0
+
+if __name__ == '__main__':
+  sys.exit(main())