Revert "Support coverage instrumentation for Linux host"
This reverts commit 358056c058e43bfb2bbae8978fbfe4a8e4c84fb5.
Reason for revert: Breaks build_test target in some branches.
Change-Id: I604561033038d4ff15b74caf7b81ff5c8dd9632f
diff --git a/cc/cc.go b/cc/cc.go
index 1e313c0..9722cf0 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -40,7 +40,6 @@
ctx.BottomUp("ndk_api", ndkApiMutator).Parallel()
ctx.BottomUp("test_per_src", testPerSrcMutator).Parallel()
ctx.BottomUp("begin", beginMutator).Parallel()
- ctx.BottomUp("coverage", coverageLinkingMutator).Parallel()
})
android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
@@ -55,6 +54,7 @@
ctx.TopDown("sanitize_runtime_deps", sanitizerRuntimeDepsMutator())
+ ctx.BottomUp("coverage", coverageLinkingMutator).Parallel()
ctx.TopDown("vndk_deps", sabiDepsMutator)
ctx.TopDown("lto_deps", ltoDepsMutator)
@@ -809,15 +809,12 @@
if c.compiler != nil {
deps = c.compiler.compilerDeps(ctx, deps)
}
- // clang_rt.profile runtime libraries necessary for PGO and coverage
- // depend on symbols from libgcc. Add the runtime library dependency
- // before libgcc gets added in linkerDeps().
+ // Add the PGO dependency (the clang_rt.profile runtime library), which
+ // sometimes depends on symbols from libgcc, before libgcc gets added
+ // in linkerDeps().
if c.pgo != nil {
deps = c.pgo.deps(ctx, deps)
}
- if c.coverage != nil {
- deps = c.coverage.deps(ctx, deps)
- }
if c.linker != nil {
deps = c.linker.linkerDeps(ctx, deps)
}
@@ -827,6 +824,9 @@
if c.sanitize != nil {
deps = c.sanitize.deps(ctx, deps)
}
+ if c.coverage != nil {
+ deps = c.coverage.deps(ctx, deps)
+ }
if c.sabi != nil {
deps = c.sabi.deps(ctx, deps)
}