Move VR test APK downloading behind an env var
BUG=697469
Review-Url: https://codereview.chromium.org/2726243002
Cr-Commit-Position: refs/heads/master@{#454628}
diff --git a/DEPS b/DEPS
index 0aed3fe..c4a4202 100644
--- a/DEPS
+++ b/DEPS
@@ -775,28 +775,6 @@
'-l', 'third_party/xstream'
],
},
- # Downloads the VR Services and Daydream Home APKs used for VR testing on
- # Android.
- {
- 'name': 'vr_services_apks',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chrome-vr-test-apks/vr_services',
- '-l', 'third_party/gvr-android-sdk/test-apks/vr_services'
- ],
- },
- {
- 'name': 'daydream_home_apks',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chrome-vr-test-apks/daydream_home',
- '-l', 'third_party/gvr-android-sdk/test-apks/daydream_home'
- ],
- },
{
# Downloads the current stable linux sysroot to build/linux/ if needed.
# This sysroot updates at about the same rate that the chrome build deps
@@ -1148,6 +1126,14 @@
'-s', 'src/third_party/node/node_modules.tar.gz.sha1',
],
},
+ # Download VR test APKs only if the environment variable is set
+ {
+ 'name': 'vr_test_apks',
+ 'pattern': '.',
+ 'action': [ 'python',
+ 'src/third_party/gvr-android-sdk/test-apks/update.py',
+ ],
+ },
]
recursedeps = [
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 0000000..173d137
--- /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
+ subprocess.check_call(['download_from_google_storage',
+ '--bucket', 'chrome-vr-test-apks/daydream_home',
+ '-d', DAYDREAM_DIR])
+ subprocess.check_call(['download_from_google_storage',
+ '--bucket', 'chrome-vr-test-apks/vr_services',
+ '-d', VR_SERVICES_DIR])
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main())
