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
This commit is contained in:
Pirama Arumuga Nainar
2022-01-19 06:51:32 +00:00
committed by Automerger Merge Worker

View File

@@ -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
# ###############################################################