Skip to content

Commit 66a9a8e

Browse files
shaybarakCQ Bot
authored andcommitted
Revert "[coverage] Remove cmx coverage support from GN SDK"
This reverts commit baa41ae. Reason for revert: broke Chromium coverage builder not detected by fx lsc Original change's description: > [coverage] Remove cmx coverage support from GN SDK > > Only one OOT cmx test that uses this left, and it's on its way out. > Drop some tech debt baggage. > > See also: > https://groups.google.com/a/google.com/g/fuchsia-cmxtinction/c/mL1CfpIW2PY/m/L17w3m8JBgAJ > > Change-Id: I4ed6897b1ea705778a2f41fdb3f5046e5e5b7c2d > Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/732824 > Commit-Queue: Shai Barack <shayba@google.com> > Fuchsia-Auto-Submit: Shai Barack <shayba@google.com> > Reviewed-by: Clayton Wilkinson <wilkinsonclay@google.com> Change-Id: I928b65804790f6a7468cb7bbde2462e11f2f6aad Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/742744 Fuchsia-Auto-Submit: Shai Barack <shayba@google.com> Reviewed-by: Greg Thompson <grt@google.com> Reviewed-by: RubberStamper 🤖 <android-build-ayeaye@system.gserviceaccount.com> Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
1 parent b9088ad commit 66a9a8e

File tree

3 files changed

+62
-37
lines changed

3 files changed

+62
-37
lines changed

scripts/sdk/gn/base/build/component.gni

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,38 @@ template("fuchsia_component") {
126126
_manifest_version = "v2"
127127
}
128128

129-
if (fuchsia_code_coverage && _manifest_version == "v2") {
130-
merged_manifest = "${target_name}-coverage.cml"
131-
cmc_merge(merged_manifest) {
132-
forward_variables_from(invoker,
133-
[
134-
"deps",
135-
"testonly",
136-
])
137-
sources = [
138-
"${fuchsia_sdk}/build/enable_coverage_data.cml",
139-
manifest,
140-
]
141-
output_name = merged_manifest
129+
if (fuchsia_code_coverage) {
130+
if (_manifest_version == "v1") {
131+
merged_manifest = "${target_name}-coverage.cmx"
132+
cmc_merge(merged_manifest) {
133+
forward_variables_from(invoker,
134+
[
135+
"deps",
136+
"testonly",
137+
])
138+
sources = [
139+
"${fuchsia_sdk}/build/enable_coverage_data.cmx",
140+
manifest,
141+
]
142+
output_name = merged_manifest
143+
}
144+
manifest = "${target_out_dir}/${merged_manifest}"
145+
} else if (_manifest_version == "v2") {
146+
merged_manifest = "${target_name}-coverage.cml"
147+
cmc_merge(merged_manifest) {
148+
forward_variables_from(invoker,
149+
[
150+
"deps",
151+
"testonly",
152+
])
153+
sources = [
154+
"${fuchsia_sdk}/build/enable_coverage_data.cml",
155+
manifest,
156+
]
157+
output_name = merged_manifest
158+
}
159+
manifest = "${target_out_dir}/${merged_manifest}"
142160
}
143-
manifest = "${target_out_dir}/${merged_manifest}"
144161
}
145162

146163
# The component manifest validated using cmx_validation for v1,
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sandbox": {
3+
"services": [
4+
"fuchsia.debugdata.Publisher"
5+
]
6+
}
7+
}
Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
{
2-
"docs": [
3-
"build/BUILD.gn",
4-
"build/build_id_dir.gni",
5-
"build/cipd.gni",
6-
"build/cmc.gni",
7-
"build/config/BUILD.gn",
8-
"build/config/config.gni",
9-
"build/enable_coverage_data.cml",
10-
"build/fuchsia_sdk_pkg.gni",
11-
"build/gn_run_binary.py",
12-
"build/fidl_library.gni",
13-
"build/gen_fidl_response_file.py",
14-
"build/package.gni",
15-
"build/component.gni",
16-
"build/populate_build_id_dir.py",
17-
"build/prepare_cipd_package_definition.py",
18-
"build/prepare_package_inputs.py",
19-
"build/pm_tool.gni",
20-
"build/test_targets.gni",
21-
"build/test.gni"
22-
],
23-
"name": "gn-rules",
24-
"type": "documentation"
2+
"docs": [
3+
"build/BUILD.gn",
4+
"build/build_id_dir.gni",
5+
"build/cipd.gni",
6+
"build/cmc.gni",
7+
"build/config/BUILD.gn",
8+
"build/config/config.gni",
9+
"build/enable_coverage_data.cml",
10+
"build/enable_coverage_data.cmx",
11+
"build/fuchsia_sdk_pkg.gni",
12+
"build/gn_run_binary.py",
13+
"build/fidl_library.gni",
14+
"build/gen_fidl_response_file.py",
15+
"build/package.gni",
16+
"build/component.gni",
17+
"build/populate_build_id_dir.py",
18+
"build/prepare_cipd_package_definition.py",
19+
"build/prepare_package_inputs.py",
20+
"build/pm_tool.gni",
21+
"build/test_targets.gni",
22+
"build/test.gni"
23+
],
24+
"name": "gn-rules",
25+
"type": "documentation"
2526
}

0 commit comments

Comments
 (0)