Snap for 11211173 from 5d6766f0e0e4382d8cd4d0376232d344e40970b6 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Id5855d5fd079a29ecbd0c367f5bf73f6e0f16ee7

1 files changed, 12 insertions, 1 deletions

diff --git a/build/config/coverage/BUILD.gn b/build/config/coverage/BUILD.gn
index 6c3fca91bc..2939e37f48 100644
--- a/build/config/coverage/BUILD.gn
+++ b/build/config/coverage/BUILD.gn
@@ -27,8 +27,11 @@ config("default_coverage") {
     }
 
     cflags = [
+      # LINT.IfChange
       "-fprofile-instr-generate",
       "-fcoverage-mapping",
+      "-mllvm",
+      "-runtime-counter-relocation=true",
 
       # Following experimental flags removes unused header functions from the
       # coverage mapping data embedded in the test binaries, and the reduction
@@ -36,6 +39,11 @@ config("default_coverage") {
       # MacOS. Please refer to crbug.com/796290 for more details.
       "-mllvm",
       "-limited-coverage-experimental=true",
+
+      # LINT.ThenChange(
+      #     /build/config/siso/clang_code_coverage_wrapper.star,
+      #     /build/toolchain/clang_code_coverage_wrapper.py,
+      # )
     ]
 
     # Rust coverage is gated on using the Chromium-built Rust toolchain as it
@@ -43,7 +51,10 @@ config("default_coverage") {
     # tools that will be used to process the coverage output. This is because
     # the coverage file format is not stable.
     if (use_chromium_rust_toolchain) {
-      rustflags += [ "-Cinstrument-coverage" ]
+      rustflags += [
+        "-Cinstrument-coverage",
+        "-Cllvm-args=-runtime-counter-relocation",
+      ]
     }
 
     if (is_linux || is_chromeos) {