commit 17541b9512ba500f9a07d800a86658b40ec93cca
author Roland Levillain <rpl@google.com> Tue Jun 09 13:04:27 2020 +0100
committer Roland Levillain <rpl@google.com> Mon Jun 15 11:51:56 2020 +0100
tree 274f0e44c282b0c6d82d6832bfd458fc1c1510c7
parent d160a49df3bc4eadaddb7f36c1d0556ce3c710ff

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
Change-Id: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 1ed81d7..0fce617 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -110,6 +110,9 @@
 $(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)))