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

Merge "Revert "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."" am: be88cd9140

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

Change-Id: I54de42fe4c310db107330d7e3b14b4675c3d1d90
This commit is contained in:
Orion Hodson
2020-07-08 14:17:47 +00:00
committed by Automerger Merge Worker
parent e38c36fec0 be88cd9140
commit cc990adddc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/main.mk
View File

@@ -102,14 +102,13 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC))
EMMA_INSTRUMENT := true
endif
# 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.
# TODO(b/158212027): Turn this into an error when all users have been moved to
# `NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS`.
ifneq ($(COVERAGE_PATHS),)
$(error Variable COVERAGE_PATHS is obsolete. Use NATIVE_COVERAGE_PATHS instead)
$(warning Variable COVERAGE_PATHS is deprecated. Please use NATIVE_COVERAGE_PATHS instead.)
endif
ifneq ($(COVERAGE_EXCLUDE_PATHS),)
$(error Variable COVERAGE_EXCLUDE_PATHS is obsolete. Use NATIVE_COVERAGE_EXCLUDE_PATHS instead)
$(warning Variable COVERAGE_EXCLUDE_PATHS is deprecated. Please use NATIVE_COVERAGE_EXCLUDE_PATHS instead.)
endif
ifeq (true,$(EMMA_INSTRUMENT))