openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors.""

This commit is contained in:
Roland Levillain 2020-07-11 14:32:10 +00:00 committed by Gerrit Code Review
parent f7d4d1e885 be3c3719d4
commit ce637304a0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/main.mk
View File

@ -102,13 +102,14 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC))
EMMA_INSTRUMENT := true EMMA_INSTRUMENT := true
endif endif
# TODO(b/158212027): Turn this into an error when all users have been moved to # TODO(b/158212027): Remove this when we are certain these assertions are not
# `NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS`. # breaking any continuous build; then turn `COVERAGE_PATHS` and
# `COVERAGE_EXCLUDE_PATHS` into kati obsolete variables.
ifneq ($(COVERAGE_PATHS),) ifneq ($(COVERAGE_PATHS),)
$(warning Variable COVERAGE_PATHS is deprecated. Please use NATIVE_COVERAGE_PATHS instead.) $(error Variable COVERAGE_PATHS is obsolete. Use NATIVE_COVERAGE_PATHS instead)
endif endif
ifneq ($(COVERAGE_EXCLUDE_PATHS),) ifneq ($(COVERAGE_EXCLUDE_PATHS),)
$(warning Variable COVERAGE_EXCLUDE_PATHS is deprecated. Please use NATIVE_COVERAGE_EXCLUDE_PATHS instead.) $(error Variable COVERAGE_EXCLUDE_PATHS is obsolete. Use NATIVE_COVERAGE_EXCLUDE_PATHS instead)
endif endif
ifeq (true,$(EMMA_INSTRUMENT)) ifeq (true,$(EMMA_INSTRUMENT))