p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" am: ce637304a0 am: e9ea935a96 

Original change: https://android-review.googlesource.com/c/platform/build/+/1360377

Change-Id: I63f1e49c66e7112e03a229a9ed47a48b894ae887
This commit is contained in:
Roland Levillain 2020-07-11 15:06:09 +00:00 committed by Automerger Merge Worker
parent e53a60c23d e9ea935a96
commit 7b309fc538
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

@ -104,13 +104,14 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC))
EMMA_INSTRUMENT := true
endif
# TODO(b/158212027): Turn this into an error when all users have been moved to
# `NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS`.
# TODO(b/158212027): Remove this when we are certain these assertions are not
# breaking any continuous build; then turn `COVERAGE_PATHS` and
# `COVERAGE_EXCLUDE_PATHS` into kati obsolete variables.
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
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
ifeq (true,$(EMMA_INSTRUMENT))