[fuchsia] Switch tool paths from 'tools' to 'tools/x64'.
The old paths were deleted in fxr/692966 which is causing
the Fuchsia SDK roll into Flutter to fail.
Bug: 107973
Change-Id: I6963a4ec293030942dc160bcf4707c2ff417d8ae
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/32025
Commit-Queue: Alexander Biggs <akbiggs@google.com>
Reviewed-by: Keyong Han <keyonghan@google.com>
diff --git a/recipe_modules/fuchsia_util/api.py b/recipe_modules/fuchsia_util/api.py
index 2c742e8..401afa2 100644
--- a/recipe_modules/fuchsia_util/api.py
+++ b/recipe_modules/fuchsia_util/api.py
@@ -94,7 +94,7 @@
destination_path: Path to store the downloaded Fuchsia dependencies.
"""
flutter_bin = checkout_path.join('bin')
- fuchsia_tools = flutter_bin.join('cache', 'artifacts', 'fuchsia', 'tools')
+ fuchsia_tools = flutter_bin.join('cache', 'artifacts', 'fuchsia', 'tools', 'x64')
self.download_fuchsia_deps(flutter_bin, destination_path)
with self.m.step.nest('Collect tool deps'):
self.m.file.copy(
diff --git a/recipe_modules/fuchsia_util/examples/full.expected/basic.json b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
index 071e6eb..75cd28a 100644
--- a/recipe_modules/fuchsia_util/examples/full.expected/basic.json
+++ b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
@@ -193,7 +193,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "None/bin/cache/artifacts/fuchsia/tools/device-finder",
+ "None/bin/cache/artifacts/fuchsia/tools/x64/device-finder",
"[CLEANUP]/tmp_tmp_1"
],
"infra_step": true,
@@ -210,7 +210,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "None/bin/cache/artifacts/fuchsia/tools/pm",
+ "None/bin/cache/artifacts/fuchsia/tools/x64/pm",
"[CLEANUP]/tmp_tmp_1"
],
"infra_step": true,
diff --git a/recipe_modules/sdk/api.py b/recipe_modules/sdk/api.py
index eb820bd..a0554fd 100644
--- a/recipe_modules/sdk/api.py
+++ b/recipe_modules/sdk/api.py
@@ -236,7 +236,7 @@
if zbi_tool_path:
zbi_path = zbi_tool_path
if not zbi_path:
- zbi_path = self.m.path.join(self.sdk_path, 'tools', 'zbi')
+ zbi_path = self.m.path.join(self.sdk_path, 'tools', 'x64', 'zbi')
if not zbi_output_path:
zbi_output_path = zbi_input_path
diff --git a/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json b/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json
index 90128c7..c1c1875 100644
--- a/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json
+++ b/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json
@@ -507,7 +507,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/mac_arm_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/mac_arm_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/mac_arm_64/zircon-a.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/mac_arm_64/zircon-a.zbi",
diff --git a/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json b/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json
index 43ef0c3..01d32ef 100644
--- a/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json
+++ b/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json
@@ -507,7 +507,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
diff --git a/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json b/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json
index c7e4866..596f87f 100644
--- a/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json
+++ b/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json
@@ -477,7 +477,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
diff --git a/recipe_modules/vdl/api.py b/recipe_modules/vdl/api.py
index 57fd25f..cb8dbab 100644
--- a/recipe_modules/vdl/api.py
+++ b/recipe_modules/vdl/api.py
@@ -205,8 +205,8 @@
add(fuchsia_images.build_args, 'qemu_buildargs')
add(fuchsia_images.kernel_file, 'qemu_kernel')
add(fuchsia_images.system_fvm, 'qemu_fvm')
- add(self.m.sdk.sdk_path.join('tools', 'far'), 'far')
- add(self.m.sdk.sdk_path.join('tools', 'fvm'), 'fvm')
+ add(self.m.sdk.sdk_path.join('tools', 'x64', 'far'), 'far')
+ add(self.m.sdk.sdk_path.join('tools', 'x64', 'fvm'), 'fvm')
# Provision and add zircon-a
authorized_zircona = self.m.buildbucket.builder_cache_path.join(
diff --git a/recipe_modules/vdl/examples/full.expected/ensure_vdl.json b/recipe_modules/vdl/examples/full.expected/ensure_vdl.json
index 2c38192..b4f6efe 100644
--- a/recipe_modules/vdl/examples/full.expected/ensure_vdl.json
+++ b/recipe_modules/vdl/examples/full.expected/ensure_vdl.json
@@ -657,7 +657,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/zircon-authorized.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
@@ -778,7 +778,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/buildargs.gn\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_buildargs\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/qemu-kernel.kernel\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_kernel\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/storage-full.blk\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_fvm\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_packages/linux_intel_64/amber-files\": [\"[CLEANUP]/vdl_runfiles__tmp_1/amber-files\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_packages/linux_intel_64/pm\": [\"[CLEANUP]/vdl_runfiles__tmp_1/pm\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_packages/linux_intel_64/qemu-x64.tar.gz\": [\"[CLEANUP]/vdl_runfiles__tmp_1/package_archive\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/far\": [\"[CLEANUP]/vdl_runfiles__tmp_1/far\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/fvm\": [\"[CLEANUP]/vdl_runfiles__tmp_1/fvm\"], \"[CACHE]/builder/aemu\": [\"[CLEANUP]/vdl_runfiles__tmp_1/aemu\"], \"[CACHE]/builder/device_spec/virtual_device.textproto\": [\"[CLEANUP]/vdl_runfiles__tmp_1/virtual_device.textproto\"], \"[CACHE]/builder/ssh/id_ed25519\": [\"[CLEANUP]/vdl_runfiles__tmp_1/id_ed25519\"], \"[CACHE]/builder/ssh/id_ed25519.pub\": [\"[CLEANUP]/vdl_runfiles__tmp_1/id_ed25519.pub\"], \"[CACHE]/builder/ssh_config\": [\"[CLEANUP]/vdl_runfiles__tmp_1/ssh_config\"], \"[CACHE]/builder/vdl/device_launcher\": [\"[CLEANUP]/vdl_runfiles__tmp_1/device_launcher\"], \"[CACHE]/builder/zircon-authorized.zbi\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_zircona-ed25519\"], \"[CACHE]/file1\": [\"[CLEANUP]/vdl_runfiles__tmp_1/foo\"], \"[CACHE]/file2\": [\"[CLEANUP]/vdl_runfiles__tmp_1/bar\"]}"
+ "{\"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/buildargs.gn\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_buildargs\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/qemu-kernel.kernel\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_kernel\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/storage-full.blk\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_fvm\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_packages/linux_intel_64/amber-files\": [\"[CLEANUP]/vdl_runfiles__tmp_1/amber-files\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_packages/linux_intel_64/pm\": [\"[CLEANUP]/vdl_runfiles__tmp_1/pm\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_packages/linux_intel_64/qemu-x64.tar.gz\": [\"[CLEANUP]/vdl_runfiles__tmp_1/package_archive\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/far\": [\"[CLEANUP]/vdl_runfiles__tmp_1/far\"], \"[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/fvm\": [\"[CLEANUP]/vdl_runfiles__tmp_1/fvm\"], \"[CACHE]/builder/aemu\": [\"[CLEANUP]/vdl_runfiles__tmp_1/aemu\"], \"[CACHE]/builder/device_spec/virtual_device.textproto\": [\"[CLEANUP]/vdl_runfiles__tmp_1/virtual_device.textproto\"], \"[CACHE]/builder/ssh/id_ed25519\": [\"[CLEANUP]/vdl_runfiles__tmp_1/id_ed25519\"], \"[CACHE]/builder/ssh/id_ed25519.pub\": [\"[CLEANUP]/vdl_runfiles__tmp_1/id_ed25519.pub\"], \"[CACHE]/builder/ssh_config\": [\"[CLEANUP]/vdl_runfiles__tmp_1/ssh_config\"], \"[CACHE]/builder/vdl/device_launcher\": [\"[CLEANUP]/vdl_runfiles__tmp_1/device_launcher\"], \"[CACHE]/builder/zircon-authorized.zbi\": [\"[CLEANUP]/vdl_runfiles__tmp_1/qemu_zircona-ed25519\"], \"[CACHE]/file1\": [\"[CLEANUP]/vdl_runfiles__tmp_1/foo\"], \"[CACHE]/file2\": [\"[CLEANUP]/vdl_runfiles__tmp_1/bar\"]}"
],
"infra_step": true,
"name": "create tree of vdl runfiles"
diff --git a/recipes/engine/femu_test.expected/dangerous_test_commands.json b/recipes/engine/femu_test.expected/dangerous_test_commands.json
index d922aba..d47922e 100644
--- a/recipes/engine/femu_test.expected/dangerous_test_commands.json
+++ b/recipes/engine/femu_test.expected/dangerous_test_commands.json
@@ -2189,7 +2189,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/zircon-authorized.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
diff --git a/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json b/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json
index dcc6091..b2bcbeb 100644
--- a/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json
+++ b/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json
@@ -2189,7 +2189,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/zircon-authorized.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
@@ -2725,7 +2725,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"purge"
],
"cwd": "[CACHE]/builder",
@@ -2749,7 +2749,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"add",
"[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"[CACHE]/builder/src/out/fuchsia_debug_x64"
@@ -3023,7 +3023,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"remove",
"[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id"
],
diff --git a/recipes/engine/femu_test.expected/multiple_non_root_fars.json b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
index 65197c6..d18df34 100644
--- a/recipes/engine/femu_test.expected/multiple_non_root_fars.json
+++ b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
@@ -2189,7 +2189,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/zircon-authorized.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
@@ -2715,7 +2715,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"purge"
],
"cwd": "[CACHE]/builder",
@@ -2739,7 +2739,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"add",
"[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"[CACHE]/builder/src/out/fuchsia_debug_x64"
@@ -2891,7 +2891,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"remove",
"[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id"
],
diff --git a/recipes/engine/femu_test.expected/start_femu_with_vdl.json b/recipes/engine/femu_test.expected/start_femu_with_vdl.json
index 037efd6..4c2ad49 100644
--- a/recipes/engine/femu_test.expected/start_femu_with_vdl.json
+++ b/recipes/engine/femu_test.expected/start_femu_with_vdl.json
@@ -2189,7 +2189,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/zbi",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/zbi",
"--output",
"[CACHE]/builder/zircon-authorized.zbi",
"[CACHE]/builder/0.20200101.0.1/fuchsia_image/linux_intel_64/zircon-a.zbi",
@@ -2717,7 +2717,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"purge"
],
"cwd": "[CACHE]/builder",
@@ -2741,7 +2741,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"add",
"[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"[CACHE]/builder/src/out/fuchsia_debug_x64"
@@ -3015,7 +3015,7 @@
},
{
"cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/symbol-index",
+ "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
"remove",
"[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id"
],
diff --git a/recipes/engine/femu_test.py b/recipes/engine/femu_test.py
index 8a9d21c..eb21857 100644
--- a/recipes/engine/femu_test.py
+++ b/recipes/engine/femu_test.py
@@ -65,7 +65,7 @@
@contextmanager
def DebugSymbols(api, out_variant):
- symbol_index = api.sdk.sdk_path.join('tools', 'symbol-index')
+ symbol_index = api.sdk.sdk_path.join('tools', 'x64', 'symbol-index')
# Purge obsolete debug symbols.
api.step('Purge debug symbols', [symbol_index, 'purge'])
diff --git a/recipes/fuchsia/fuchsia.expected/basic.json b/recipes/fuchsia/fuchsia.expected/basic.json
index 4037a20..f3608ae 100644
--- a/recipes/fuchsia/fuchsia.expected/basic.json
+++ b/recipes/fuchsia/fuchsia.expected/basic.json
@@ -458,7 +458,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/bin/cache/artifacts/fuchsia/tools/device-finder",
+ "[START_DIR]/flutter/bin/cache/artifacts/fuchsia/tools/x64/device-finder",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/flutter",
@@ -493,7 +493,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/flutter/bin/cache/artifacts/fuchsia/tools/pm",
+ "[START_DIR]/flutter/bin/cache/artifacts/fuchsia/tools/x64/pm",
"[CLEANUP]/tmp_tmp_1"
],
"cwd": "[START_DIR]/flutter",
