tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I531c6a60d9b33c61d493e83a5f30201ba5bde292
This commit is contained in:
Orion Hodson 2020-07-08 14:28:51 +00:00 committed by Automerger Merge Worker
commit 053157150c
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/main.mk
View file

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