commit dbdd594fae7af51342c43b9f02c08ed528fb0c48
author Pirama Arumuga Nainar <pirama@google.com> Wed Jan 19 06:51:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 19 06:51:32 2022 +0000
tree 9d3f49c91c3373e4b4555511c1e1892f137c3ef0
parent 6d70ba5041d7457fec2aa234c4150ebeebf0886e
parent 76c6975e0545ced527d267522d69edfaf1dc4ca8

Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0 am: 6332808700 am: 76c6975e05

Original change: https://android-review.googlesource.com/c/platform/build/+/1953525

Change-Id: Ic2454804d74ef2a3862a6b3ced172aefdbd9eccc

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index ecd35a9..33edd94 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -331,22 +331,6 @@
 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
 # ###############################################################