From e6e4da2ff356efada16359e85712144b8ce4b0e8 Mon Sep 17 00:00:00 2001 From: Bryant Chandler Date: Tue, 5 Apr 2022 16:49:04 +0000 Subject: [PATCH] Revert "[fuchsia] Use SDK provided gn templates for d8" This reverts commit 3111db91f8fbf8d9ce8b94c43a8b835d356d456f. Reason for revert: This has runtime failures because including cmx fragments isn't working ocrrectly. Still investigating why this wasn't discovered by CQ. Original change's description: > [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} Bug: chromium:1092804 Change-Id: Ib9a4d4f8e04c6cd7f3bd289e7c956b6115a77a25 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3572004 Bot-Commit: Rubber Stamper Reviewed-by: Wez Reviewed-by: Michael Achenbach Reviewed-by: Camillo Bruni Commit-Queue: Bryant Chandler Cr-Commit-Position: refs/heads/main@{#79860} --- BUILD.gn | 16 +++++----------- src/d8/d8.cmx | 9 --------- 2 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 src/d8/d8.cmx diff --git a/BUILD.gn b/BUILD.gn index c5f46f1b0c..313ae5356a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -6055,23 +6055,17 @@ group("v8_archive") { if (is_fuchsia && !build_with_chromium) { import("//build/config/fuchsia/rules.gni") - fuchsia_component("d8_fuchsia_component") { + cr_fuchsia_package("d8_fuchsia_pkg") { testonly = true - manifest = "src/d8/d8.cmx" - data_deps = [ ":d8" ] - visibility = [ ":*" ] - } - - fuchsia_package("d8_fuchsia_pkg") { - testonly = true - package_name = "d8" - deps = [ ":d8_fuchsia_component" ] + binary = ":d8" + manifest = "gni/v8.cmx" + package_name_override = "d8" } fuchsia_package_runner("d8_fuchsia") { testonly = true package = ":d8_fuchsia_pkg" - package_name = "d8" + package_name_override = "d8" } } diff --git a/src/d8/d8.cmx b/src/d8/d8.cmx deleted file mode 100644 index cac59d61ae..0000000000 --- a/src/d8/d8.cmx +++ /dev/null @@ -1,9 +0,0 @@ -{ - "include": [ - "build/config/fuchsia/test/minimum_capabilities.test-cmx", - "gni/v8.cmx" - ], - "program": { - "binary": "d8" - } -} \ No newline at end of file