StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables." am: 18a4837e07 am: eac977277e

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

Change-Id: I495754cce3a252e33ad893cbc733fade18484daf
This commit is contained in:
Roland Levillain
2020-07-13 15:28:30 +00:00
committed by Automerger Merge Worker
parent 31ebad0968 eac977277e
commit 5b64b25892
4 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/binary.mk
View File

@@ -71,12 +71,8 @@ ifeq (,$(strip $(my_cc))$(strip $(my_cxx)))
my_pool := $(GOMA_OR_RBE_POOL) my_pool := $(GOMA_OR_RBE_POOL)
endif endif
# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this condition when all users have been moved ifneq (,$(strip $(foreach dir,$(NATIVE_COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
# to `NATIVE_COVERAGE_PATHS`. ifeq (,$(strip $(foreach dir,$(NATIVE_COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
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)))))
my_native_coverage := true my_native_coverage := true
else else
my_native_coverage := false my_native_coverage := false

2
core/config.mk
View File

@@ -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 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_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 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. # Used to force goals to build. Only use for conditionally defined goals.
.PHONY: FORCE .PHONY: FORCE

10
core/main.mk
View File

@@ -104,16 +104,6 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC))
EMMA_INSTRUMENT := true EMMA_INSTRUMENT := true
endif 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)) ifeq (true,$(EMMA_INSTRUMENT))
# Adding the jacoco library can cause the inclusion of # Adding the jacoco library can cause the inclusion of
# some typically banned classes # some typically banned classes

8
core/soong_config.mk
View File

@@ -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, GcovCoverage, $(filter true,$(NATIVE_COVERAGE)))
$(call add_json_bool, ClangCoverage, $(filter true,$(CLANG_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 $(call add_json_list, NativeCoveragePaths, $(NATIVE_COVERAGE_PATHS))
# `NATIVE_COVERAGE_PATHS`. $(call add_json_list, NativeCoverageExcludePaths, $(NATIVE_COVERAGE_EXCLUDE_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_bool, SamplingPGO, $(filter true,$(SAMPLING_PGO))) $(call add_json_bool, SamplingPGO, $(filter true,$(SAMPLING_PGO)))