Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0
am: 6332808700
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525 Change-Id: I8d711cdaf94e5a88da0e863fde3bab56ab3aeb60
This commit is contained in:
committed by
Automerger Merge Worker
commit
76c6975e05
@@ -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
|
||||
# ###############################################################
|
||||
|
Reference in New Issue
Block a user