[vdl] Upgrade vdl version The newer version contains migration from using amberctl to pkgctl and various bug fixes. Also remove deprecated flags for fdc (fuchsia device controller). Test: https://ci.chromium.org/swarming/task/54e8b4a2cea37210?server=chromium-swarm.appspot.com Bug: fxb/81182 Change-Id: I83e747a4636f2064509394b2ddfd859b30a90c84 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/16020 Reviewed-by: Darren Chan <chandarren@google.com> Commit-Queue: Yuan Zhi <yuanzhi@google.com>
diff --git a/recipes/femu_test.expected/dangerous_test_commands.json b/recipes/femu_test.expected/dangerous_test_commands.json index a91ad69..f995bae 100644 --- a/recipes/femu_test.expected/dangerous_test_commands.json +++ b/recipes/femu_test.expected/dangerous_test_commands.json
@@ -570,7 +570,7 @@ "-root", "[CACHE]/builder/vdl", "-ensure-file", - "fuchsia/vdl/${platform} g3-revision:vdl_fuchsia_20210316_RC00", + "fuchsia/vdl/${platform} g3-revision:vdl_fuchsia_20210722_RC00", "-max-threads", "0", "-json-output",
diff --git a/recipes/femu_test.expected/start_femu_with_vdl.json b/recipes/femu_test.expected/start_femu_with_vdl.json index 92f4d90..853a477 100644 --- a/recipes/femu_test.expected/start_femu_with_vdl.json +++ b/recipes/femu_test.expected/start_femu_with_vdl.json
@@ -570,7 +570,7 @@ "-root", "[CACHE]/builder/vdl", "-ensure-file", - "fuchsia/vdl/${platform} g3-revision:vdl_fuchsia_20210316_RC00", + "fuchsia/vdl/${platform} g3-revision:vdl_fuchsia_20210722_RC00", "-max-threads", "0", "-json-output", @@ -2168,8 +2168,6 @@ "--resize_fvm=2G", "--gpu=swiftshader_indirect", "--headless_mode=true", - "--enable_grpc_server=false", - "--enable_grpc_tls=false", "--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files", "--serve_packages=flutter_aot_runner-0.far,v2_test-123.far", "--test_suite=v2_test", @@ -2217,8 +2215,6 @@ "--resize_fvm=2G", "--gpu=swiftshader_indirect", "--headless_mode=true", - "--enable_grpc_server=false", - "--enable_grpc_tls=false", "--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files", "--serve_packages=flutter_aot_runner-0.far,v1_test_component-321.far", "--test_suite=v1_test_component",
diff --git a/recipes/femu_test.py b/recipes/femu_test.py index ca84ec6..9686d06 100644 --- a/recipes/femu_test.py +++ b/recipes/femu_test.py
@@ -103,7 +103,7 @@ ) def addVDLFiles(): - vdl_version = api.properties.get('vdl_version', 'g3-revision:vdl_fuchsia_20210316_RC00') + vdl_version = api.properties.get('vdl_version', 'g3-revision:vdl_fuchsia_20210722_RC00') api.vdl.set_vdl_cipd_tag(tag=str(vdl_version)) add(api.vdl.vdl_path, 'device_launcher') add(api.vdl.aemu_dir, 'aemu') @@ -192,8 +192,6 @@ cmd.append('--resize_fvm=2G') cmd.append('--gpu=swiftshader_indirect') cmd.append('--headless_mode=true') - cmd.append('--enable_grpc_server=false') - cmd.append('--enable_grpc_tls=false') cmd.append( '--system_images=' \ '{build_args},{kernel},{fvm},{zircona},{ssh_config},{ssh_id_public},' \