From 14323e5cf0f7cebdd70633cf48cb01eb749e1ada Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Tue, 9 Jun 2020 13:04:27 +0100 Subject: [PATCH] Introduce product variables to select Java code coverage paths in Make. Introduce product variables `JavaCoveragePaths` and `JavaCoverageExcludePaths` (resp. populated from environment variables `JAVA_COVERAGE_PATHS` and `JAVA_COVERAGE_EXCLUDE_PATHS`). Use them to control which Java modules are candidate for instrumentation based on their source path. By default (when `JavaCoveragePaths` is empty), have all Java modules be candidate for instrumentation, to preserve the existing behavior. Test: export EMMA_INSTRUMENT=true \ && export EMMA_INSTRUMENT_FRAMEWORK=true \ && export JAVA_COVERAGE_PATHS=art \ && m Bug: 158212027 Bug: 156284897 Merged-In: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9 Change-Id: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9 --- core/soong_config.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index b69052adb5..e6d5f54410 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -110,6 +110,9 @@ $(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_list, JavaCoveragePaths, $(JAVA_COVERAGE_PATHS)) +$(call add_json_list, JavaCoverageExcludePaths, $(JAVA_COVERAGE_EXCLUDE_PATHS)) + $(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)))