commit f9a54a86ec9172bfc6dc4da55c2d8d3ad9ce49b0
author Pirama Arumuga Nainar <pirama@google.com> Mon Jan 10 22:36:57 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 10 22:36:57 2022 +0000
tree 7da9bf50c18534b9b1d173ee6303f6c24d1978d1
parent afd4ccd70bfbbb07fd995cd2cccd06c8842b1355
parent e59f0f66fca09c641cc92baeebecdb1c8acf9bba

Merge "Enable continuous coverage: use '%c' specifier in LLVM_PROFILE_FILE"

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index ce2ec0e..2ed9eec 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -75,9 +75,14 @@
   EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/trace
 endif
 
-EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS :=
 ifeq ($(CLANG_COVERAGE),true)
-  EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/misc/trace/clang-%20m.profraw
+  ifeq ($(BIONIC_COVERAGE),false)
+    # http://b/210012154 Disable continuous coverage if instrumentation is on
+    # for bionic/libc
+    EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/misc/trace/clang%c-%20m.profraw
+  else
+    EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/misc/trace/clang-%20m.profraw
+  endif
 endif
 
 # Put it here instead of in init.rc module definition,