[Fuchsia] Rename additional_manifests to additional_manifest_fragments
Replace incorrect name of manifests to manifest fragments.
Bug: 1187357
Change-Id: I4a9d42eb96eba20059cef682a1934b0e7c4d9359
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2787981
Auto-Submit: Chong Gu <chonggu@google.com>
Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Chong Gu <chonggu@google.com>
Cr-Commit-Position: refs/heads/master@{#867665}
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 507b29c..f05f1501 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -3530,7 +3530,7 @@
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
- additional_manifests =
+ additional_manifest_fragments =
[ "//build/config/fuchsia/test/test_logger_capabilities.test-cmx" ]
}
diff --git a/build/config/fuchsia/test/README.md b/build/config/fuchsia/test/README.md
index e800a10..31b8ebd 100644
--- a/build/config/fuchsia/test/README.md
+++ b/build/config/fuchsia/test/README.md
@@ -3,7 +3,8 @@
This directory contains the cmx fragments that are required for running
Fuchsia tests hermetically. Tests start from `minimum_capabilities.test-cmx`
and add additional capabilities as necessary by providing the
-additional_manifests argument. Some fragments are explained in detail below:
+`additional_manifest_fragments` argument. Some fragments are explained in detail
+below:
### General Purpose Fragments
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 790905f..13098ad0 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -861,7 +861,7 @@
]
if (is_fuchsia) {
- additional_manifests = [
+ additional_manifest_fragments = [
"//build/config/fuchsia/test/font_capabilities.test-cmx",
# TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
diff --git a/components/viz/BUILD.gn b/components/viz/BUILD.gn
index 7735378..9023967 100644
--- a/components/viz/BUILD.gn
+++ b/components/viz/BUILD.gn
@@ -36,7 +36,7 @@
}
if (is_fuchsia) {
- additional_manifests = [
+ additional_manifest_fragments = [
# TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
"//build/config/fuchsia/test/jit_capabilities.test-cmx",
diff --git a/fuchsia/engine/BUILD.gn b/fuchsia/engine/BUILD.gn
index c7299891..8aa3c36 100644
--- a/fuchsia/engine/BUILD.gn
+++ b/fuchsia/engine/BUILD.gn
@@ -394,7 +394,7 @@
"//ui/gfx",
"//ui/ozone",
]
- additional_manifests = [
+ additional_manifest_fragments = [
"//build/config/fuchsia/test/jit_capabilities.test-cmx",
"//build/config/fuchsia/test/network_capabilities.test-cmx",
"//build/config/fuchsia/test/present_view_capabilities.test-cmx",
@@ -438,7 +438,7 @@
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
]
- additional_manifests = [
+ additional_manifest_fragments = [
"//build/config/fuchsia/test/access_test_data_dir.test-cmx",
# TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
@@ -477,7 +477,7 @@
":web_engine",
"web_engine",
] ]
- additional_manifests = [
+ additional_manifest_fragments = [
"//build/config/fuchsia/test/network_capabilities.test-cmx",
"//build/config/fuchsia/test/read_debug_data.test-cmx",
"//build/config/fuchsia/test/vulkan_capabilities.test-cmx",
diff --git a/fuchsia/runners/BUILD.gn b/fuchsia/runners/BUILD.gn
index 183c6d9..ebcbe0e 100644
--- a/fuchsia/runners/BUILD.gn
+++ b/fuchsia/runners/BUILD.gn
@@ -198,7 +198,7 @@
"web_engine",
],
]
- additional_manifests = [
+ additional_manifest_fragments = [
"//build/config/fuchsia/test/network_capabilities.test-cmx",
"//build/config/fuchsia/test/vulkan_capabilities.test-cmx",
"//build/config/fuchsia/test/web_engine_required_capabilities.test-cmx",
@@ -227,7 +227,7 @@
"//testing/gtest",
"//ui/ozone",
]
- additional_manifests = [
+ additional_manifest_fragments = [
"//build/config/fuchsia/test/jit_capabilities.test-cmx",
"//build/config/fuchsia/test/network_capabilities.test-cmx",
"//build/config/fuchsia/test/vulkan_capabilities.test-cmx",
@@ -283,7 +283,7 @@
"web_runner",
],
]
- additional_manifests = [
+ additional_manifest_fragments = [
"//build/config/fuchsia/test/network_capabilities.test-cmx",
"//build/config/fuchsia/test/vulkan_capabilities.test-cmx",
"//build/config/fuchsia/test/web_engine_required_capabilities.test-cmx",
diff --git a/testing/test.gni b/testing/test.gni
index d4f1e97..03fc3a5 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -259,10 +259,10 @@
_pkg_target = "${_output_name}_pkg"
_exec_target = "${_output_name}__exec"
- # TODO(1019938): make minimum_capabilities.test-cmx the default and have
- # everything added via additional_manifests
+ # TODO(crbug.com/1019938): make minimum_capabilities.test-cmx the default
+ # and have everything added via additional_manifest_fragments
if (!defined(invoker.manifest)) {
- if (!defined(invoker.additional_manifests)) {
+ if (!defined(invoker.additional_manifest_fragments)) {
manifest_fragments = [ "//build/config/fuchsia/tests-with-exec.cmx" ]
} else {
manifest_fragments =
@@ -272,8 +272,8 @@
manifest_fragments = [ invoker.manifest ]
}
- if (defined(invoker.additional_manifests)) {
- manifest_fragments += invoker.additional_manifests
+ if (defined(invoker.additional_manifest_fragments)) {
+ manifest_fragments += invoker.additional_manifest_fragments
}
if (use_clang_coverage) {
manifest_fragments +=
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index cdc6924f..f638d50 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -376,7 +376,7 @@
}
if (is_fuchsia) {
- additional_manifests =
+ additional_manifest_fragments =
[ "//build/config/fuchsia/test/present_view_capabilities.test-cmx" ]
}
diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
index f9a14c8..ea8c813 100644
--- a/ui/compositor/BUILD.gn
+++ b/ui/compositor/BUILD.gn
@@ -277,7 +277,7 @@
}
if (is_fuchsia) {
- additional_manifests = [
+ additional_manifest_fragments = [
# TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
"//build/config/fuchsia/test/jit_capabilities.test-cmx",
diff --git a/ui/snapshot/BUILD.gn b/ui/snapshot/BUILD.gn
index df8dd44..22e747c 100644
--- a/ui/snapshot/BUILD.gn
+++ b/ui/snapshot/BUILD.gn
@@ -119,7 +119,7 @@
}
if (is_fuchsia) {
- additional_manifests = [
+ additional_manifest_fragments = [
# TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
"//build/config/fuchsia/test/jit_capabilities.test-cmx",