diff options
Diffstat (limited to 'build/tasks/generate_cmsdk_coverage.mk')
| -rw-r--r-- | build/tasks/generate_cmsdk_coverage.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/build/tasks/generate_cmsdk_coverage.mk b/build/tasks/generate_cmsdk_coverage.mk index d9be81a..38b70b1 100644 --- a/build/tasks/generate_cmsdk_coverage.mk +++ b/build/tasks/generate_cmsdk_coverage.mk @@ -18,7 +18,7 @@ # Makefile for producing cmsdk coverage reports. # Run "make cmsdk-test-coverage" in the $ANDROID_BUILD_TOP directory. -cts_api_coverage_exe := $(HOST_OUT_EXECUTABLES)/cts-api-coverage +cmsdk_api_coverage_exe := $(HOST_OUT_EXECUTABLES)/cmsdk-api-coverage dexdeps_exe := $(HOST_OUT_EXECUTABLES)/dexdeps coverage_out := $(HOST_OUT)/cmsdk-api-coverage @@ -30,16 +30,17 @@ $(api_xml_description) : $(api_text_description) $(APICHECK) $(hide) mkdir -p $(dir $@) $(hide) $(APICHECK_COMMAND) -convert2xml $< $@ -cmsdk-test-coverage-report := $(coverage_out)/test-coverage.html +cmsdk-test-coverage-report := $(coverage_out)/cmsdk-test-coverage.html cmsdk_tests_apk := $(call intermediates-dir-for,APPS,CMPlatformTests)/package.apk -cmsdk_api_coverage_dependencies := $(cts_api_coverage_exe) $(dexdeps_exe) $(api_xml_description) +cmsettingsprovider_tests_apk := $(call intermediates-dir-for,APPS,CMSettingsProviderTests)/package.apk +cmsdk_api_coverage_dependencies := $(cmsdk_api_coverage_exe) $(dexdeps_exe) $(api_xml_description) -$(cmsdk-test-coverage-report): PRIVATE_TEST_CASES := $(cmsdk_tests_apk) -$(cmsdk-test-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe) +$(cmsdk-test-coverage-report): PRIVATE_TEST_CASES := $(cmsdk_tests_apk) $(cmsettingsprovider_tests_apk) +$(cmsdk-test-coverage-report): PRIVATE_CMSDK_API_COVERAGE_EXE := $(cmsdk_api_coverage_exe) $(cmsdk-test-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe) $(cmsdk-test-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description) -$(cmsdk-test-coverage-report): $(cmsdk_tests_apk) $(cmsdk_api_coverage_dependencies) | $(ACP) +$(cmsdk-test-coverage-report): $(cmsdk_tests_apk) $(cmsettingsprovider_tests_apk) $(cmsdk_api_coverage_dependencies) | $(ACP) $(call generate-cm-coverage-report,"CMSDK API Coverage Report",\ $(PRIVATE_TEST_CASES),html) @@ -57,8 +58,8 @@ endif # 3 - Format of the report define generate-cm-coverage-report $(hide) mkdir -p $(dir $@) - $(hide) $(PRIVATE_CTS_API_COVERAGE_EXE) -d $(PRIVATE_DEXDEPS_EXE) -a $(PRIVATE_API_XML_DESC) -f $(3) -o $@ $(2) -cm - @ echo $(1): file://$(ANDROID_BUILD_TOP)/$@ + $(hide) $(PRIVATE_CMSDK_API_COVERAGE_EXE) -d $(PRIVATE_DEXDEPS_EXE) -a $(PRIVATE_API_XML_DESC) -f $(3) -o $@ $(2) -cm + @ echo $(1): file://$@ endef # Reset temp vars |