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

Commit f7a596a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use space-separated coverage paths."

parents d690ca5b a435aa51

core/binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS) 
my_export_c_include_deps := $(LOCAL_EXPORT_C_INCLUDE_DEPS)

my_arflags :=



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

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

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

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

  my_native_coverage := true

else

  my_native_coverage := false

core/soong_config.mk

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ $(call add_json_bool, ClangTidy, $(filter 1 true,$(WITH_ 
$(call add_json_str,  TidyChecks,                        $(WITH_TIDY_CHECKS))



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

$(call add_json_csv,  CoveragePaths,                     $(COVERAGE_PATHS))

$(call add_json_csv,  CoverageExcludePaths,              $(COVERAGE_EXCLUDE_PATHS))

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

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



$(call add_json_bool, ArtUseReadBarrier,                 $(call invert_bool,$(filter false,$(PRODUCT_ART_USE_READ_BARRIER))))

$(call add_json_bool, Binder32bit,                       $(BINDER32BIT))