Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ace58607 authored by Roland Levillain's avatar Roland Levillain
Browse files

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
parent 3cea91a6

core/main.mk

+5 −4
Original line number Diff line number Diff line
@@ -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))