Commit 5ef2a8bf authored by Nico Weber's avatar Nico Weber

Stop passing --platform to download_from_google_storage.

All the calls are protected by gclient conditionals now, so the flags
are no longer needed.

Mostly no functional change, except one: The Windows orderfiles hook now
runs on non-Windows hosts when targeting Windows.

Bug: 495204
Change-Id: I549409dc945b7ecf0fe060908923834dbf0cf0a3
Reviewed-on: https://chromium-review.googlesource.com/723922Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509671}
parent 4ef9e35f
...@@ -782,7 +782,6 @@ hooks = [ ...@@ -782,7 +782,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=win32',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gn', '--bucket', 'chromium-gn',
'-s', 'src/buildtools/win/gn.exe.sha1', '-s', 'src/buildtools/win/gn.exe.sha1',
...@@ -795,7 +794,6 @@ hooks = [ ...@@ -795,7 +794,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=darwin',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gn', '--bucket', 'chromium-gn',
'-s', 'src/buildtools/mac/gn.sha1', '-s', 'src/buildtools/mac/gn.sha1',
...@@ -808,7 +806,6 @@ hooks = [ ...@@ -808,7 +806,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gn', '--bucket', 'chromium-gn',
'-s', 'src/buildtools/linux64/gn.sha1', '-s', 'src/buildtools/linux64/gn.sha1',
...@@ -822,7 +819,6 @@ hooks = [ ...@@ -822,7 +819,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=win32',
'--no_auth', '--no_auth',
'--bucket', 'chromium-clang-format', '--bucket', 'chromium-clang-format',
'-s', 'src/buildtools/win/clang-format.exe.sha1', '-s', 'src/buildtools/win/clang-format.exe.sha1',
...@@ -835,7 +831,6 @@ hooks = [ ...@@ -835,7 +831,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=darwin',
'--no_auth', '--no_auth',
'--bucket', 'chromium-clang-format', '--bucket', 'chromium-clang-format',
'-s', 'src/buildtools/mac/clang-format.sha1', '-s', 'src/buildtools/mac/clang-format.sha1',
...@@ -848,7 +843,6 @@ hooks = [ ...@@ -848,7 +843,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-clang-format', '--bucket', 'chromium-clang-format',
'-s', 'src/buildtools/linux64/clang-format.sha1', '-s', 'src/buildtools/linux64/clang-format.sha1',
...@@ -862,7 +856,6 @@ hooks = [ ...@@ -862,7 +856,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=win32',
'--no_auth', '--no_auth',
'--bucket', 'chromium-browser-clang/orderfiles', '--bucket', 'chromium-browser-clang/orderfiles',
'-d', 'src/chrome/build', '-d', 'src/chrome/build',
...@@ -876,7 +869,6 @@ hooks = [ ...@@ -876,7 +869,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=win32',
'--no_auth', '--no_auth',
'--bucket', 'chromium-luci', '--bucket', 'chromium-luci',
'-d', 'src/tools/luci-go/win64', '-d', 'src/tools/luci-go/win64',
...@@ -889,7 +881,6 @@ hooks = [ ...@@ -889,7 +881,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=darwin',
'--no_auth', '--no_auth',
'--bucket', 'chromium-luci', '--bucket', 'chromium-luci',
'-d', 'src/tools/luci-go/mac64', '-d', 'src/tools/luci-go/mac64',
...@@ -902,7 +893,6 @@ hooks = [ ...@@ -902,7 +893,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-luci', '--bucket', 'chromium-luci',
'-d', 'src/tools/luci-go/linux64', '-d', 'src/tools/luci-go/linux64',
...@@ -928,7 +918,6 @@ hooks = [ ...@@ -928,7 +918,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=win32',
'--directory', '--directory',
'--recursive', '--recursive',
'--no_auth', '--no_auth',
...@@ -990,7 +979,6 @@ hooks = [ ...@@ -990,7 +979,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--extract', '--extract',
'--no_auth', '--no_auth',
'--bucket', 'chromium-nodejs/6.9.4', '--bucket', 'chromium-nodejs/6.9.4',
...@@ -1004,7 +992,6 @@ hooks = [ ...@@ -1004,7 +992,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=darwin',
'--extract', '--extract',
'--no_auth', '--no_auth',
'--bucket', 'chromium-nodejs/6.9.4', '--bucket', 'chromium-nodejs/6.9.4',
...@@ -1018,7 +1005,6 @@ hooks = [ ...@@ -1018,7 +1005,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=win32',
'--no_auth', '--no_auth',
'--bucket', 'chromium-nodejs/6.9.4', '--bucket', 'chromium-nodejs/6.9.4',
'-s', 'src/third_party/node/win/node.exe.sha1', '-s', 'src/third_party/node/win/node.exe.sha1',
...@@ -1059,7 +1045,6 @@ hooks = [ ...@@ -1059,7 +1045,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--no_auth', '--no_auth',
'--num_threads=4', '--num_threads=4',
'--bucket', 'chromium-tools-traffic_annotation', '--bucket', 'chromium-tools-traffic_annotation',
...@@ -1335,7 +1320,6 @@ hooks = [ ...@@ -1335,7 +1320,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gvr-static-shim', '--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1', '-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1',
...@@ -1348,7 +1332,6 @@ hooks = [ ...@@ -1348,7 +1332,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gvr-static-shim', '--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1', '-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1',
...@@ -1361,7 +1344,6 @@ hooks = [ ...@@ -1361,7 +1344,6 @@ hooks = [
'action': [ 'python', 'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py', 'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume', '--no_resume',
'--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gvr-static-shim/controller_test_api', '--bucket', 'chromium-gvr-static-shim/controller_test_api',
'-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1', '-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment