diff options
| author | Roland Levillain <rpl@google.com> | 2020-06-09 13:04:27 +0100 |
|---|---|---|
| committer | Oliver Nguyen <olivernguyen@google.com> | 2020-06-29 18:01:25 -0700 |
| commit | 14323e5cf0f7cebdd70633cf48cb01eb749e1ada (patch) | |
| tree | d3b53b3041b2d5c56f3d316f358334700419f65f | |
| parent | bdb1b4c79afea29d8708afeb09771eaaa6753350 (diff) | |
| download | build_make-14323e5cf0f7cebdd70633cf48cb01eb749e1ada.tar.gz build_make-14323e5cf0f7cebdd70633cf48cb01eb749e1ada.tar.bz2 build_make-14323e5cf0f7cebdd70633cf48cb01eb749e1ada.zip | |
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
| -rw-r--r-- | core/soong_config.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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))) |