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

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

Merge "Rename native code coverage paths product variables in Make." am: d160a49d am: b502030f 

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

Change-Id: I5d132e7781b92814f3e003d73719bf7da4f175c6
parents bd8b0a4b b502030f

core/binary.mk

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

endif



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

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

# 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)))))

  my_native_coverage := true

else

  my_native_coverage := false

core/line_coverage.mk

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#

# To run the make target set the coverage related envvars first:

# 	NATIVE_LINE_COVERAGE=true NATIVE_COVERAGE=true \

#	COVERAGE_PATHS=* make haiku-line-coverage

#	NATIVE_COVERAGE_PATHS=* make haiku-line-coverage

# -----------------------------------------------------------------



# TODO(b/148306195): Due this issue some fuzz targets cannot be built with

core/soong_config.mk

+6 −2
Original line number Diff line number Diff line
@@ -113,8 +113,12 @@ $(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS)) 
$(call add_json_bool, NativeLineCoverage,                $(filter true,$(NATIVE_LINE_COVERAGE)))

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

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

$(call add_json_list, CoveragePaths,                     $(COVERAGE_PATHS))

$(call add_json_list, CoverageExcludePaths,              $(COVERAGE_EXCLUDE_PATHS))

# 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_bool, SamplingPGO,                       $(filter true,$(SAMPLING_PGO)))