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

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

All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` (in AOSP and downstream branches) have
been replaced with `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

This reverts commit 62d9912677.

Reason for revert: The cause of the build breakages caused by the
initial change has been addressed.

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Bug: 160769227
Change-Id: Ic267e1b61e84bc6f016a3eb57efe7f9b859adb42
This commit is contained in:
Roland Levillain 2020-07-10 08:23:37 +00:00
parent 62d9912677
commit be3c3719d4
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
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))