diff --git a/BUILD.gn b/BUILD.gn index 78bddc354e..43667839c5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -6385,18 +6385,25 @@ group("v8_archive") { # TODO(dglazkov): Remove the "!build_with_chromium" condition once this clause # is removed from Chromium. if (is_fuchsia && !build_with_chromium) { - import("//build/config/fuchsia/rules.gni") + import("//build/config/fuchsia/generate_runner_scripts.gni") + import("//third_party/fuchsia-sdk/sdk/build/component.gni") + import("//third_party/fuchsia-sdk/sdk/build/package.gni") - cr_fuchsia_package("d8_fuchsia_pkg") { + fuchsia_component("d8_component") { testonly = true - binary = ":d8" - manifest = "gni/v8.cmx" - package_name_override = "d8" + manifest = "gni/v8.cml" + data_deps = [ ":d8" ] + } + + fuchsia_package("d8_pkg") { + testonly = true + package_name = "d8" + deps = [ ":d8_component" ] } fuchsia_package_installer("d8_fuchsia") { testonly = true - package = ":d8_fuchsia_pkg" + package = ":d8_pkg" package_name = "d8" } } diff --git a/gni/OWNERS b/gni/OWNERS index fa1262b503..5f16e60686 100644 --- a/gni/OWNERS +++ b/gni/OWNERS @@ -1,5 +1,6 @@ file:../INFRA_OWNERS +per-file v8.cml=victorgomes@chromium.org per-file v8.cmx=victorgomes@chromium.org per-file release_branch_toggle.gni=v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com -per-file release_branch_toggle.gni=vahl@chromium.org \ No newline at end of file +per-file release_branch_toggle.gni=vahl@chromium.org diff --git a/gni/v8.cml b/gni/v8.cml new file mode 100644 index 0000000000..4d74c7626c --- /dev/null +++ b/gni/v8.cml @@ -0,0 +1,21 @@ +// Copyright 2022 The V8 project authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +{ + include: [ "syslog/client.shard.cml" ], + program: { + runner: "elf", + binary: "d8", + }, + use: [ + { + protocol: [ + "fuchsia.kernel.VmexResource", + ], + }, + { + storage: "tmp", + path: "/tmp", + }, + ], +}