From e6b84974086ece202129730d27a4349ca8f696ba Mon Sep 17 00:00:00 2001
From: Pirama Arumuga Nainar <pirama@google.com>
Date: Tue, 18 Jan 2022 13:08:22 -0800
Subject: [PATCH] Revert "Set a BIONIC_COVERAGE .mk variable"

This reverts commit b1b4e1e38b3a1d094de5515eaae2c7e6b6e542ed.

Bug: http://b/194128476

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: Ib34f607292cd64e7cb9fe35c59a4f79b46904ab8
---
 core/config.mk | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index 3c7c5ced98..e146f642b8 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -331,22 +331,6 @@ else
 JAVA_TMPDIR_ARG :=
 endif
 
-# http://b/210012154 Set BIONIC_COVERAGE if coverage is enabled for bionic.  This
-# disable continuous coverage and removes '%c' from init.environ.rc:LLVM_PROFILE_FILE
-ifeq ($(NATIVE_COVERAGE_PATHS),*)
-  ifeq ($(filter bionic%,$(NATIVE_COVERAGE_EXCLUDE_PATHS)),)
-	BIONIC_COVERAGE := true
-  else
-	BIONIC_COVERAGE := false
-  endif
-else
-  ifeq ($(filter bionic%,$(NATIVE_COVERAGE_PATHS)),)
-	BIONIC_COVERAGE := false
-  else
-	BIONIC_COVERAGE := true
-  endif
-endif
-
 # ###############################################################
 # Include sub-configuration files
 # ###############################################################