diff --git a/rootdir/Android.mk b/rootdir/Android.mk index ce2ec0ed8..2ed9eecc6 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -75,9 +75,14 @@ ifeq ($(NATIVE_COVERAGE),true) 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,