Change CTS Report Output Directory
Move the report into a separate directory, because the main CTS rule
was deleting the "cts" directory causing issues where the report got
deleted after it was done.
Change-Id: I8ade6e5d0bdce50285cde4dff572f6263d103dac
diff --git a/CtsTestCoverage.mk b/CtsTestCoverage.mk
index 3d30554..7053fea 100644
--- a/CtsTestCoverage.mk
+++ b/CtsTestCoverage.mk
@@ -22,7 +22,7 @@
CTS_API_COVERAGE_EXE := $(HOST_OUT_EXECUTABLES)/cts-api-coverage
DEXDEPS_EXE := $(HOST_OUT_EXECUTABLES)/dexdeps
-COVERAGE_OUT := $(HOST_OUT)/cts/api-coverage
+COVERAGE_OUT := $(HOST_OUT)/cts-api-coverage
cts-test-coverage-report := $(COVERAGE_OUT)/test-coverage.html
cts-verifier-coverage-report := $(COVERAGE_OUT)/verifier-coverage.html
@@ -30,11 +30,11 @@
$(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),html,$(HOST_OUT)/cts/api-coverage,test-coverage.html)
+ $(CTS_COVERAGE_TEST_CASE_LIST),html,test-coverage.html)
$(cts-verifier-coverage-report) : CtsVerifier $(CTS_API_COVERAGE_DEPENDENCIES)
$(call generate-coverage-report,"CTS Verifier API Coverage Report",\
- CtsVerifier,html,$(HOST_OUT)/cts/api-coverage,verifier-coverage.html)
+ CtsVerifier,html,verifier-coverage.html)
.PHONY: cts-test-coverage
cts-test-coverage : $(cts-test-coverage-report)
@@ -52,15 +52,12 @@
# 1 - Name of the report printed out on the screen
# 2 - Name of APK packages that will be scanned to generate the report
# 3 - Format of the report
-# 4 - Output directory to put the report
-# 5 - Output file name of the report
+# 4 - Output file name of the report
define generate-coverage-report
- $(hide) mkdir -p $(4)
-
$(foreach testcase,$(2),$(eval $(call add-testcase-apk,$(testcase))))
- $(hide) $(CTS_API_COVERAGE_EXE) -d $(DEXDEPS_EXE) -f $(3) -o $(4)/$(5) $(TEST_APKS)
-
- @echo $(1): file://$(ANDROID_BUILD_TOP)/$(4)/$(5)
+ $(hide) mkdir -p $(COVERAGE_OUT)
+ $(hide) $(CTS_API_COVERAGE_EXE) -d $(DEXDEPS_EXE) -f $(3) -o $(COVERAGE_OUT)/$(4) $(TEST_APKS)
+ $(hide) echo $(1): file://$(ANDROID_BUILD_TOP)/$(COVERAGE_OUT)/$(4)
endef
define add-testcase-apk