Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525 Change-Id: I89fafa01cb74dc0ef5ba316f5ca95718978a7baa
This commit is contained in:
committed by
Automerger Merge Worker
commit
6332808700
@@ -331,22 +331,6 @@ else
|
|||||||
JAVA_TMPDIR_ARG :=
|
JAVA_TMPDIR_ARG :=
|
||||||
endif
|
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
|
# Include sub-configuration files
|
||||||
# ###############################################################
|
# ###############################################################
|
||||||
|
Reference in New Issue
Block a user