StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors." am: 01ce4a0b02 am: e38c36fec0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1356639

Change-Id: I1c68053b54fbe25ab0e6fd70a172c29430662d62
This commit is contained in:
Roland Levillain
2020-07-08 10:40:59 +00:00
committed by Automerger Merge Worker
parent f372e83206 e38c36fec0
commit 0186ba0e25
1 changed files with 5 additions and 4 deletions
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))