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

Commit 4073abb6 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Revert "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into... 

Merge "Revert "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" am: be88cd91 am: cc990add am: 05315715

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

Change-Id: I5c88d4cb291065019007a025b5f7d63152fa607b
parents 1d545a0b 05315715

core/main.mk

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