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

Commit 7b309fc5 authored by Roland Levillain's avatar Roland Levillain Committed by Automerger Merge Worker
Browse files

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

Merge "Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" am: ce637304 am: e9ea935a

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

Change-Id: I63f1e49c66e7112e03a229a9ed47a48b894ae887
parents e53a60c2 e9ea935a

core/main.mk

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