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

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

Merge "Turn `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into obsolete... 

Merge "Turn `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into obsolete variables." am: 18a4837e am: eac97727 am: 5b64b258 am: d0e32537

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

Change-Id: I7102eb7c6f26d085b4e5dcc34dce7d582dac9f23
parents 3131c6f6 d0e32537

core/binary.mk

+2 −6
Original line number Diff line number Diff line
@@ -71,12 +71,8 @@ ifeq (,$(strip $(my_cc))$(strip $(my_cxx))) 
  my_pool := $(GOMA_OR_RBE_POOL)

endif



# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this condition when all users have been moved

# to `NATIVE_COVERAGE_PATHS`.

ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this condition when all users have been

# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`.

ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

ifneq (,$(strip $(foreach dir,$(NATIVE_COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

ifeq (,$(strip $(foreach dir,$(NATIVE_COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

  my_native_coverage := true

else

  my_native_coverage := false

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ $(KATI_obsolete_var \ 
$(KATI_obsolete_var TARGET_PREFER_32_BIT TARGET_PREFER_32_BIT_APPS TARGET_PREFER_32_BIT_EXECUTABLES)

$(KATI_obsolete_var PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_WHITELIST,Use PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST.)

$(KATI_obsolete_var PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST,Use PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST.)

$(KATI_obsolete_var COVERAGE_PATHS,Use NATIVE_COVERAGE_PATHS instead)

$(KATI_obsolete_var COVERAGE_EXCLUDE_PATHS,Use NATIVE_COVERAGE_EXCLUDE_PATHS instead)



# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

core/main.mk

+0 −10
Original line number Diff line number Diff line
@@ -104,16 +104,6 @@ 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.

ifneq ($(COVERAGE_PATHS),)

  $(error Variable COVERAGE_PATHS is obsolete. Use NATIVE_COVERAGE_PATHS instead)

endif

ifneq ($(COVERAGE_EXCLUDE_PATHS),)

  $(error Variable COVERAGE_EXCLUDE_PATHS is obsolete. Use NATIVE_COVERAGE_EXCLUDE_PATHS instead)

endif



ifeq (true,$(EMMA_INSTRUMENT))

# Adding the jacoco library can cause the inclusion of

# some typically banned classes

core/soong_config.mk

+2 −6
Original line number Diff line number Diff line
@@ -116,12 +116,8 @@ $(call add_json_list, JavaCoverageExcludePaths, $(JAVA_COVERAGE_EXCLUDE 


$(call add_json_bool, GcovCoverage,                      $(filter true,$(NATIVE_COVERAGE)))

$(call add_json_bool, ClangCoverage,                     $(filter true,$(CLANG_COVERAGE)))

# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this list when all users have been moved to

# `NATIVE_COVERAGE_PATHS`.

$(call add_json_list, NativeCoveragePaths,               $(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS))

# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this list when all users have been

# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`.

$(call add_json_list, NativeCoverageExcludePaths,        $(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS))

$(call add_json_list, NativeCoveragePaths,               $(NATIVE_COVERAGE_PATHS))

$(call add_json_list, NativeCoverageExcludePaths,        $(NATIVE_COVERAGE_EXCLUDE_PATHS))



$(call add_json_bool, SamplingPGO,                       $(filter true,$(SAMPLING_PGO)))