Merge "Embed host liblz4.so in target_files"
diff --git a/core/config.mk b/core/config.mk
index e146f64..3c7c5ce 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -331,6 +331,22 @@
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
# ###############################################################