[Fuchsia] Add coverage support for non-test components
Allow use_clang_coverage to follow fuchsia_code_coverage,
allowing coverage info to propagate for integration tests.
Remove logic put in test template to add coverage
info.
Bug: 1197272,1156885
Change-Id: I6e7c3d98e626bdd8b71c300297c426523dd49b29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2908652
Auto-Submit: Chong Gu <[email protected]>
Reviewed-by: Dirk Pranke <[email protected]>
Reviewed-by: David Dorwin <[email protected]>
Reviewed-by: John Chen <[email protected]>
Commit-Queue: Chong Gu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#886559}
diff --git a/testing/test.gni b/testing/test.gni
index e5d04a5b..dcb883b 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -23,7 +23,6 @@
import("//build/config/sanitizers/sanitizers.gni")
} else if (is_fuchsia) {
import("//build/config/chromecast_build.gni")
- import("//build/config/coverage/coverage.gni")
import("//build/config/fuchsia/generate_runner_scripts.gni")
import("//build/config/fuchsia/package.gni")
import("//third_party/fuchsia-sdk/sdk/build/cmc.gni")
@@ -320,10 +319,7 @@
if (defined(invoker.additional_manifest_fragments)) {
manifest_fragments += invoker.additional_manifest_fragments
}
- if (use_clang_coverage) {
- manifest_fragments +=
- [ "//build/config/fuchsia/add_DebugData_service.test-cmx" ]
- }
+
combined_manifest = "${target_name}.test-cmx"
cmc_merge(combined_manifest) {
sources = manifest_fragments
