Put cts-test-coverage report to the dist dir if "cts" is in the make
goals.
Bug: 3245588
Change-Id: I7cad15622e1c33e6789e8cd305606554ca07af85
diff --git a/CtsTestCoverage.mk b/CtsTestCoverage.mk
index 44a7b1a..459f219 100644
--- a/CtsTestCoverage.mk
+++ b/CtsTestCoverage.mk
@@ -19,13 +19,24 @@
include cts/CtsTestCaseList.mk
-CTS_API_COVERAGE_DEPENDENCIES := cts-api-coverage dexdeps $(ACP)
+CTS_API_COVERAGE_EXE := $(HOST_OUT_EXECUTABLES)/cts-api-coverage
-.PHONY: cts-test-coverage
-cts-test-coverage: $(CTS_COVERAGE_TEST_CASE_LIST) $(CTS_API_COVERAGE_DEPENDENCIES)
+CTS_API_COVERAGE_DEPENDENCIES := $(CTS_API_COVERAGE_EXE) dexdeps $(ACP)
+
+cts-test-coverage-report := $(HOST_OUT)/cts/test-coverage/api-coverage.xml
+
+$(cts-test-coverage-report) : $(CTS_COVERAGE_TEST_CASE_LIST) $(CTS_API_COVERAGE_DEPENDENCIES)
$(call generate-coverage-report,"CTS Tests API Coverage Report",\
$(CTS_COVERAGE_TEST_CASE_LIST),xml,$(HOST_OUT)/cts/test-coverage,api-coverage.xml)
+.PHONY: cts-test-coverage
+cts-test-coverage : $(cts-test-coverage-report)
+
+# Put the test coverage report in the dist dir if "cts" is among the build goals.
+ifneq ($(filter cts, $(MAKECMDGOALS)),)
+ $(call dist-for-goals, cts, $(cts-test-coverage-report):cts-test-coverage-report.xml)
+endif
+
.PHONY: cts-verifier-coverage
cts-verifier-coverage: CtsVerifier $(CTS_API_COVERAGE_DEPENDENCIES)
$(call generate-coverage-report,"CTS Verifier API Coverage Report",\
@@ -43,7 +54,7 @@
$(hide) $(ACP) cts/tools/cts-api-coverage/res/* $(4)
$(foreach testcase,$(2),$(eval $(call add-testcase-apk,$(testcase))))
- $(hide) cts-api-coverage -f $(3) -o $(4)/$(5) $(TEST_APKS)
+ $(hide) $(CTS_API_COVERAGE_EXE) -f $(3) -o $(4)/$(5) $(TEST_APKS)
@echo $(1): file://$(ANDROID_BUILD_TOP)/$(4)/$(5)
endef
