Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -1205,6 +1205,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',
Expand Down
7 changes: 7 additions & 0 deletions tools/fuchsia/with_envs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down