From 3111db91f8fbf8d9ce8b94c43a8b835d356d456f Mon Sep 17 00:00:00 2001 From: Bryant Chandler Date: Mon, 28 Mar 2022 11:56:40 -0700 Subject: [PATCH] [fuchsia] Use SDK provided gn templates for d8 cr_fuchsia_package is deprecated in favor of using the Fuchsia SDK provided rules directly. This CL adds a cmx file specifically for v8_unittests. CMX files define fuchsia components, see https://chromium-review.googlesource.com/c/chromium/src/+/3529652 for more info. Bug: chromium:1092804 Change-Id: Ibf1d866ec6b94a0e1a7a7c7c443a6ee80e3b1042 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3537885 Reviewed-by: Victor Gomes Reviewed-by: Wez Reviewed-by: Camillo Bruni Commit-Queue: Bryant Chandler Cr-Commit-Position: refs/heads/main@{#79760} --- BUILD.gn | 16 +++++++++++----- src/d8/d8.cmx | 9 +++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/d8/d8.cmx diff --git a/BUILD.gn b/BUILD.gn index 0d8248a66a..41e726203c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -6059,17 +6059,23 @@ group("v8_archive") { if (is_fuchsia && !build_with_chromium) { import("//build/config/fuchsia/rules.gni") - cr_fuchsia_package("d8_fuchsia_pkg") { + fuchsia_component("d8_fuchsia_component") { testonly = true - binary = ":d8" - manifest = "gni/v8.cmx" - package_name_override = "d8" + manifest = "src/d8/d8.cmx" + data_deps = [ ":d8" ] + visibility = [ ":*" ] + } + + fuchsia_package("d8_fuchsia_pkg") { + testonly = true + package_name = "d8" + deps = [ ":d8_fuchsia_component" ] } fuchsia_package_runner("d8_fuchsia") { testonly = true package = ":d8_fuchsia_pkg" - package_name_override = "d8" + package_name = "d8" } } diff --git a/src/d8/d8.cmx b/src/d8/d8.cmx new file mode 100644 index 0000000000..cac59d61ae --- /dev/null +++ b/src/d8/d8.cmx @@ -0,0 +1,9 @@ +{ + "include": [ + "build/config/fuchsia/test/minimum_capabilities.test-cmx", + "gni/v8.cmx" + ], + "program": { + "binary": "d8" + } +} \ No newline at end of file