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

Commit 2cf5fae4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6657497 from 6c9f3b9f to mainline-release 

Change-Id: Id0beedf0a45e2a6860220ca45723b09f2c82c07c
parents e7523721 6c9f3b9f

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

+2 −3
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 
# packs them into another zip file called `line_coverage_profiles.zip`.

#

# 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=true NATIVE_COVERAGE_PATHS=* make haiku-line-coverage

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



# TODO(b/148306195): Due this issue some fuzz targets cannot be built with
@@ -68,7 +67,7 @@ critical_components_shared_inputs := $(foreach lib,$(critical_components_shared) 
fuzz_target_inputs := $(foreach fuzz,$(fuzz_targets), \

	$(call intermediates-dir-for,EXECUTABLES,$(fuzz))/$(fuzz))



# When line coverage is enabled (NATIVE_LINE_COVERAGE is set), make creates

# When coverage is enabled (NATIVE_COVERAGE is set), make creates

# a "coverage" directory and stores all profile (*.gcno) files in inside.

# We need everything that is stored inside this directory.

$(line_coverage_profiles): $(fuzz_target_inputs)

core/soong_config.mk

+10 −4
Original line number Diff line number Diff line
@@ -110,11 +110,17 @@ $(call add_json_bool, DisableScudo, $(filter true,$(PRODUCT 
$(call add_json_bool, ClangTidy,                         $(filter 1 true,$(WITH_TIDY)))

$(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_list, JavaCoveragePaths,                 $(JAVA_COVERAGE_PATHS))

$(call add_json_list, JavaCoverageExcludePaths,          $(JAVA_COVERAGE_EXCLUDE_PATHS))



$(call add_json_bool, GcovCoverage,                      $(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)))