From aa4de1fa91af7c44b203c9b55cd0de1e292dd235 Mon Sep 17 00:00:00 2001 From: Kaido Kert Date: Wed, 4 Sep 2024 08:11:09 -0700 Subject: [PATCH] Move download_from_gcs to Starboard Removes reverse dependency from Starboard to Cobalt b/364421874 --- .pre-commit-config.yaml | 2 +- cobalt/media/testing/BUILD.gn | 2 +- cobalt/renderer/BUILD.gn | 2 +- components/crx_file/BUILD.gn | 2 +- download_resources.py | 2 +- starboard/shared/starboard/player/BUILD.gn | 2 +- {cobalt => starboard}/tools/download_from_gcs.py | 0 {cobalt => starboard}/tools/download_from_gcs_test.py | 2 +- .../tools/testing/download_from_gcs/clang-format.sha1 | 0 .../testing/download_from_gcs/test_dir/clang-format.exe.sha1 | 0 .../tools/testing/download_from_gcs/test_dir/clang-format.sha1 | 0 11 files changed, 7 insertions(+), 7 deletions(-) rename {cobalt => starboard}/tools/download_from_gcs.py (100%) rename {cobalt => starboard}/tools/download_from_gcs_test.py (98%) rename {cobalt => starboard}/tools/testing/download_from_gcs/clang-format.sha1 (100%) rename {cobalt => starboard}/tools/testing/download_from_gcs/test_dir/clang-format.exe.sha1 (100%) rename {cobalt => starboard}/tools/testing/download_from_gcs/test_dir/clang-format.sha1 (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3320afde09fb..28ecfa471925 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -176,7 +176,7 @@ repos: always_run: true stages: [push] additional_dependencies: [certifi] - args: [-m, unittest, cobalt/tools/download_from_gcs_test.py] + args: [-m, unittest, starboard/tools/download_from_gcs_test.py] - id: test-python3-compatibility name: Test Python 3 Compatibility description: Checks that scripts can be run in Python 3 diff --git a/cobalt/media/testing/BUILD.gn b/cobalt/media/testing/BUILD.gn index 49052ff3706e..dd0f9252bc79 100644 --- a/cobalt/media/testing/BUILD.gn +++ b/cobalt/media/testing/BUILD.gn @@ -17,7 +17,7 @@ import("//cobalt/media/testing/data/sha1_files.gni") action("cobalt_media_download_test_data") { install_content = true - script = "//cobalt/tools/download_from_gcs.py" + script = "//starboard/tools/download_from_gcs.py" sha_sources = [] foreach(sha1_file, sha1_files) { diff --git a/cobalt/renderer/BUILD.gn b/cobalt/renderer/BUILD.gn index 25aaa1cabb00..412218f5c877 100644 --- a/cobalt/renderer/BUILD.gn +++ b/cobalt/renderer/BUILD.gn @@ -500,7 +500,7 @@ copy("renderer_copy_lottie_test_data") { action("renderer_download_lottie_test_data") { install_content = true - script = "//cobalt/tools/download_from_gcs.py" + script = "//starboard/tools/download_from_gcs.py" inputs = [ "$_lottie_resource_path/finger_print-expected.png.sha1", diff --git a/components/crx_file/BUILD.gn b/components/crx_file/BUILD.gn index 0614a146e2b5..35274525aa2f 100644 --- a/components/crx_file/BUILD.gn +++ b/components/crx_file/BUILD.gn @@ -35,7 +35,7 @@ if (is_starboard) { action("crx_file_download_test_data") { install_content = true - script = "//cobalt/tools/download_from_gcs.py" + script = "//starboard/tools/download_from_gcs.py" sha_sources = [] foreach(sha1_file, sha1_files) { diff --git a/download_resources.py b/download_resources.py index 8e6ab153f679..af5a35078a63 100644 --- a/download_resources.py +++ b/download_resources.py @@ -22,7 +22,7 @@ except ImportError: import urllib2 as urllib -from cobalt.tools import download_from_gcs +from starboard.tools import download_from_gcs def DownloadGerritCommitMsgHook(force=False): diff --git a/starboard/shared/starboard/player/BUILD.gn b/starboard/shared/starboard/player/BUILD.gn index 25b786f71583..ab2fbd9b2ecb 100644 --- a/starboard/shared/starboard/player/BUILD.gn +++ b/starboard/shared/starboard/player/BUILD.gn @@ -34,7 +34,7 @@ static_library("video_dmp") { action("player_download_test_data") { install_content = true - script = "//cobalt/tools/download_from_gcs.py" + script = "//starboard/tools/download_from_gcs.py" sha_sources = [] foreach(sha1_file, sha1_files) { diff --git a/cobalt/tools/download_from_gcs.py b/starboard/tools/download_from_gcs.py similarity index 100% rename from cobalt/tools/download_from_gcs.py rename to starboard/tools/download_from_gcs.py diff --git a/cobalt/tools/download_from_gcs_test.py b/starboard/tools/download_from_gcs_test.py similarity index 98% rename from cobalt/tools/download_from_gcs_test.py rename to starboard/tools/download_from_gcs_test.py index 120e77a0994a..f10abd858d34 100755 --- a/cobalt/tools/download_from_gcs_test.py +++ b/starboard/tools/download_from_gcs_test.py @@ -18,7 +18,7 @@ import tempfile import unittest -from cobalt.tools import download_from_gcs +from starboard.tools import download_from_gcs _BUCKET = 'chromium-clang-format' _HASH_FILE_EXT = '.sha1' diff --git a/cobalt/tools/testing/download_from_gcs/clang-format.sha1 b/starboard/tools/testing/download_from_gcs/clang-format.sha1 similarity index 100% rename from cobalt/tools/testing/download_from_gcs/clang-format.sha1 rename to starboard/tools/testing/download_from_gcs/clang-format.sha1 diff --git a/cobalt/tools/testing/download_from_gcs/test_dir/clang-format.exe.sha1 b/starboard/tools/testing/download_from_gcs/test_dir/clang-format.exe.sha1 similarity index 100% rename from cobalt/tools/testing/download_from_gcs/test_dir/clang-format.exe.sha1 rename to starboard/tools/testing/download_from_gcs/test_dir/clang-format.exe.sha1 diff --git a/cobalt/tools/testing/download_from_gcs/test_dir/clang-format.sha1 b/starboard/tools/testing/download_from_gcs/test_dir/clang-format.sha1 similarity index 100% rename from cobalt/tools/testing/download_from_gcs/test_dir/clang-format.sha1 rename to starboard/tools/testing/download_from_gcs/test_dir/clang-format.sha1