From dbd3883b9bcec4fa2b88603179205e5e72a31bde Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 18 Jan 2022 13:07:23 -0800 Subject: [PATCH] Revert "Enable continuous coverage: use '%c' specifier in LLVM_PROFILE_FILE" Bug: http://b/194128476 Bug: http://b/210012154 This reverts commit e59f0f66fca09c641cc92baeebecdb1c8acf9bba. Coverage metrics dropped for ~10 of the 40 modules. There are also regressions in mainline when running tests on older platform builds. Test: presubmit Change-Id: I50a011f68dcdc25883a68701c51e7e2aabc5a7dc --- rootdir/Android.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 2ed9eecc6..ce2ec0ed8 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -75,14 +75,9 @@ ifeq ($(NATIVE_COVERAGE),true) EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/trace endif +EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := ifeq ($(CLANG_COVERAGE),true) - 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 + EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/misc/trace/clang-%20m.profraw endif # Put it here instead of in init.rc module definition,