From 1e6f3f83086789f4c7017b32ed6fa305d2b69d68 Mon Sep 17 00:00:00 2001
From: Hzj_jie <zijiehe@google.com>
Date: Wed, 6 Mar 2024 11:27:02 -0800
Subject: [PATCH 1/2] format

---
 DEPS                       | 3 +++
 tools/fuchsia/with_envs.py | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/DEPS b/DEPS
index c1f5551d6d8fa..87b209148d704 100644
--- a/DEPS
+++ b/DEPS
@@ -1201,6 +1201,9 @@ hooks = [
     'pattern': '.',
     'condition': 'run_fuchsia_emu',
     'action': [
+      'env',
+      'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}',
+      'FUCHSIA_SDK_PATH={fuchsia_sdk_path}',
       'python3',
       'src/flutter/tools/fuchsia/with_envs.py',
       'src/flutter/tools/fuchsia/test_scripts/update_product_bundles.py',
diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py
index 8f66f3b7437ef..73f3ace1a4d4a 100644
--- a/tools/fuchsia/with_envs.py
+++ b/tools/fuchsia/with_envs.py
@@ -30,6 +30,13 @@ def Main():
   assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system()
   os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/')
 
+  if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True':
+    sdk_path = os.environ['FUCHSIA_SDK_PATH']
+    assert sdk_path.endswith('/linux-amd64/core.tar.gz')
+    assert not sdk_path.startswith('/')
+    os.environ['FUCHSIA_SDK_OVERRIDE'
+              ] = 'gs://fuchsia-artifacts/' + sdk_path[:-len('/linux-amd64/core.tar.gz')]
+
   with subprocess.Popen(sys.argv[1:]) as proc:
     try:
       proc.wait()

From a2db2abb60f6521f0bd5857895c7dbd121cf0e5a Mon Sep 17 00:00:00 2001
From: Hzj_jie <zijiehe@google.com>
Date: Thu, 7 Mar 2024 10:30:32 -0800
Subject: [PATCH 2/2] update test-script

---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 0d0000bab40bb..7d3a477f48e8c 100644
--- a/DEPS
+++ b/DEPS
@@ -257,7 +257,7 @@ vars = {
   # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
-  'fuchsia_test_scripts_version': 'vf8imeAzGv_gjYQDoqub2laI-6nkB3gQNiGuVaFForMC',
+  'fuchsia_test_scripts_version': 'XtkBHdNTtIpWdxN_lUNf6VqnvPUhvGTYgPDqob1R65EC',
 
   # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
   # used altogether with fuchsia-sdk to generate gn based build rules.