chromium/src
0
Fork 0
Code Activity

Reland "[fuchsia] Migrate to terminal.x64 from .qemu-x64"

Browse Source 
This reverts commit f0c6fb2953.

Reason for revert: Fixed issue with emulator

Original change's description:
> Revert "[fuchsia] Migrate to terminal.x64 from .qemu-x64"
>
> This reverts commit 9c325cdaae.
>
> Reason for revert: crbug/1479464
>
> Original change's description:
> > [fuchsia] Migrate to terminal.x64 from .qemu-x64
> >
> > This will allow the Fuchsia project to delete the .qemu-x64 board.
> >
> > Bug: b/293640613
> > Change-Id: I620caff59061ec214b7513c0ce58de03dde114f3
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4823626
> > Reviewed-by: Zijie He <zijiehe@google.com>
> > Commit-Queue: John Wittrock <wittrock@google.com>
> > Cr-Commit-Position: refs/heads/main@{#1192540}
>
> Bug: b/293640613
> Change-Id: Icafa3fb76dc3c1d69a085abbf6e3b851fe05e9fd
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4847529
> Commit-Queue: Chong Gu <chonggu@google.com>
> Auto-Submit: Chong Gu <chonggu@google.com>
> Commit-Queue: Zijie He <zijiehe@google.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Reviewed-by: Zijie He <zijiehe@google.com>
> Cr-Commit-Position: refs/heads/main@{#1193296}

Bug: b/293640613
Change-Id: I8f2ff0b1590b0cd391539a22686cc959eb415ea8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4854462
Auto-Submit: Chong Gu <chonggu@google.com>
Commit-Queue: Zijie He <zijiehe@google.com>
Reviewed-by: Zijie He <zijiehe@google.com>
Cr-Commit-Position: refs/heads/main@{#1194388}
This commit is contained in:
Chong Gu
2023-09-09 00:12:12 +00:00
committed by Chromium LUCI CQ
parent 67ed709ced
commit 26d25309d7
5 changed files with 11 additions and 8 deletions

4
DEPS

@ -193,7 +193,7 @@ vars = {
# Available images:
# Emulation:
# - core.x64-dfv2
# - terminal.qemu-x64
# - terminal.x64
# - terminal.qemu-arm64
# - workstation.qemu-x64
# Hardware:
@ -203,7 +203,7 @@ vars = {
# Since the images are hundreds of MB, default to only downloading the image
# most commonly useful for developers. Bots and developers that need to use
# other images can override this with additional images.
'checkout_fuchsia_boot_images': "terminal.qemu-x64",
'checkout_fuchsia_boot_images': "terminal.x64",
'checkout_fuchsia_product_bundles': '"{checkout_fuchsia_boot_images}" != ""',
# By default, do not check out files required to run fuchsia tests in

5
build/fuchsia/test/ffx_emulator.py

@ -26,7 +26,10 @@ class FfxEmulator(AbstractContextManager):
if args.product:
self._product = args.product
else:
self._product = 'terminal.qemu-' + get_host_arch()
if get_host_arch() == 'x64':
self._product = 'terminal.x64'
else:
self._product = 'terminal.qemu-arm64'
self._enable_graphics = args.enable_graphics
self._hardware_gpu = args.hardware_gpu

2
build/fuchsia/update_product_bundles.py

@ -23,7 +23,7 @@ import update_sdk
_IMAGE_TO_PRODUCT_BUNDLE = {
'core.x64-dfv2-release': 'core.x64-dfv2',
'qemu.arm64': 'terminal.qemu-arm64',
'qemu.x64': 'terminal.qemu-x64',
'qemu.x64': 'terminal.x64',
'workstation_eng.chromebook-x64-dfv2-release':
'workstation_eng.chromebook-x64-dfv2',
'workstation_eng.chromebook-x64-release': 'workstation_eng.chromebook-x64',

6
build/fuchsia/update_product_bundles_test.py

@ -40,7 +40,7 @@ class TestUpdateProductBundles(unittest.TestCase):
]
self.assertEqual(
update_product_bundles.convert_to_products(deprecated_images), [
'terminal.qemu-arm64', 'terminal.qemu-x64', 'core.x64-dfv2',
'terminal.qemu-arm64', 'terminal.x64', 'core.x64-dfv2',
'workstation_eng.chromebook-x64'
])
for i, deprecated_image in enumerate(deprecated_images):
@ -65,7 +65,7 @@ class TestUpdateProductBundles(unittest.TestCase):
mock_exists):
with mock.patch('common.SDK_ROOT', 'some/path'):
self._ffx_mock.return_value.stdout = json.dumps([{
"name": "terminal.qemu-x64",
"name": "terminal.x64",
"spec": {
"type": "pm",
"path": "some/path/that/exists"
@ -81,7 +81,7 @@ class TestUpdateProductBundles(unittest.TestCase):
mock_abspath.side_effect = lambda x: x
self.assertEqual(update_product_bundles.get_repositories(), [{
"name": "terminal.qemu-x64",
"name": "terminal.x64",
"spec": {
"type": "pm",
"path": "some/path/that/exists"

2
docs/fuchsia/build_instructions.md

@ -148,7 +148,7 @@ both images. The set of available images is listed in the
[DEPS file](https://source.chromium.org/chromium/chromium/src/+/main:DEPS).
Note: fxbug.dev/85552 tracks migration away from the legacy image names, like
`qemu.x64`, which is mapped to `terminal.qemu-x64-release` by the
`qemu.x64`, which is mapped to `terminal.x64-release` by the
[`update_images.py`](https://source.chromium.org/chromium/chromium/src/+/main:build/fuchsia/update_images.py)
helper script.