From ace5860719e5aac0ce59ad6f346b62db7c648647 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Tue, 7 Jul 2020 14:49:49 +0100 Subject: [PATCH] Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors. All known uses of environment variables `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` have been replaced with `NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.). 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 Change-Id: Icc7c1d9734e78c2bf327f00f04355700b5476648 --- core/main.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index 812cce0235..2a0d847b3f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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))