Merge "Fix code coverage definitions for the test-runner tests."
diff --git a/testrunner/coverage_targets.xml b/testrunner/coverage_targets.xml
index 869c905..09da0c8 100644
--- a/testrunner/coverage_targets.xml
+++ b/testrunner/coverage_targets.xml
@@ -52,9 +52,7 @@
<src path="wifi/java" />
</coverage_target>
<coverage_target name="android.test.runner"
- build_path="frameworks/base/test-runner" type="JAVA_LIBRARIES">
- <src path="." />
- </coverage_target>
+ build_path="frameworks/base/test-runner" type="JAVA_LIBRARIES" />
<!-- apps -->
<coverage_target name="ApiDemos" build_path="development/samples/ApiDemos"
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 9b3b7ca..381190c 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -80,9 +80,9 @@
continuous="true" />
<test name="frameworks-testrunner"
- build_path="frameworks/base/test-runner/tests"
+ build_path="frameworks/base/test-runner"
package="com.android.frameworks.testrunner.tests"
- coverage_target="framework"
+ coverage_target="android.test.runner"
continuous="true" />
<test name="frameworks-vpn"