diff options
Diffstat (limited to 'chromium/build')
| -rw-r--r-- | chromium/build/fuchsia/fvdl_target.py | 7 | ||||
| -rwxr-xr-x | chromium/build/fuchsia/update_sdk.py (renamed from chromium/build/fuchsia/override_sdk.py) | 16 | ||||
| -rw-r--r-- | chromium/build/util/LASTCHANGE | 2 | ||||
| -rw-r--r-- | chromium/build/util/LASTCHANGE.committime | 2 |
4 files changed, 23 insertions, 4 deletions
diff --git a/chromium/build/fuchsia/fvdl_target.py b/chromium/build/fuchsia/fvdl_target.py index b92898805d6..71d0d88885c 100644 --- a/chromium/build/fuchsia/fvdl_target.py +++ b/chromium/build/fuchsia/fvdl_target.py @@ -110,6 +110,9 @@ class FvdlTarget(emu_target.EmuTarget): fvm_image = common.EnsurePathExists( boot_data.GetTargetFile('storage-full.blk', self._image_arch, self._image_type)) + aemu_path = common.EnsurePathExists( + os.path.join(common.GetHostToolPathFromPlatform('aemu_internal'), + 'emulator')) emu_command = [ self._FVDL_PATH, '--sdk', @@ -126,6 +129,10 @@ class FvdlTarget(emu_target.EmuTarget): '-c', ' '.join(boot_data.GetKernelArgs()), + # Use an existing emulator checked out by Chromium. + '--aemu-path', + aemu_path, + # Use existing images instead of downloading new ones. '--kernel-image', kernel_image, diff --git a/chromium/build/fuchsia/override_sdk.py b/chromium/build/fuchsia/update_sdk.py index 13c778135bc..545103e7b1b 100755 --- a/chromium/build/fuchsia/override_sdk.py +++ b/chromium/build/fuchsia/update_sdk.py @@ -10,6 +10,7 @@ import argparse import logging import os import platform +import subprocess import sys from common import GetHostOsFromPlatform, SDK_ROOT @@ -36,6 +37,8 @@ def _GetTarballPath(gcs_tarball_prefix: str) -> str: def main(): parser = argparse.ArgumentParser() + parser.add_argument('--cipd-prefix', help='CIPD base directory for the SDK.') + parser.add_argument('--version', help='Specifies the SDK version.') parser.add_argument('--verbose', '-v', action='store_true', @@ -46,15 +49,24 @@ def main(): # Exit if there's no SDK support for this platform. try: - GetHostOsFromPlatform() + host_plat = GetHostOsFromPlatform() except: logging.warning('Fuchsia SDK is not supported on this platform.') return 0 sdk_override = os.path.join(os.path.dirname(__file__), 'sdk_override.txt') - # Exit if there is no override file. + # Download from CIPD if there is no override file. if not os.path.isfile(sdk_override): + if not args.cipd_prefix: + parser.exit(1, '--cipd-prefix must be specified.') + if not args.version: + parser.exit(2, '--version must be specified.') + ensure_file = '%s%s-%s %s' % (args.cipd_prefix, host_plat, _GetHostArch(), + args.version) + subprocess.run(('cipd', 'ensure', '-ensure-file', '-', '-root', SDK_ROOT), + check=True, + input=ensure_file.encode('utf-8')) return 0 with open(sdk_override, 'r') as f: diff --git a/chromium/build/util/LASTCHANGE b/chromium/build/util/LASTCHANGE index abd04717f3c..1004713ca75 100644 --- a/chromium/build/util/LASTCHANGE +++ b/chromium/build/util/LASTCHANGE @@ -1,2 +1,2 @@ -LASTCHANGE=fb2e06d2dee20fe0c804528502b5ad72c613abd9-refs/branch-heads/5249_118@{#3} +LASTCHANGE=1f525e3e0b3d3539b9d5f67bfd3dd29bdb851e3c-refs/branch-heads/5249@{#949} LASTCHANGE_YEAR=2022 diff --git a/chromium/build/util/LASTCHANGE.committime b/chromium/build/util/LASTCHANGE.committime index b93670bd532..a1b5efa02ab 100644 --- a/chromium/build/util/LASTCHANGE.committime +++ b/chromium/build/util/LASTCHANGE.committime @@ -1 +1 @@ -1665613668
\ No newline at end of file +1669600992
\ No newline at end of file |