am 13130ae0: Merge change 25340 into eclair

Merge commit '13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3' into eclair-plus-aosp

* commit '13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3':
  Specify emma dump file location on the device explicitly

tools/scripts/android_test_rules.xml

@@ -16,6 +16,7 @@
 
     <macrodef name="run-tests-helper">
         <attribute name="emma.enabled" default="false" />
+        <element name="extra-instrument-args" optional="yes" />
         <sequential>
             <echo>Running tests ...</echo>
             <exec executable="${adb}" failonerror="true">
@@ -26,6 +27,7 @@
                 <arg value="-e" />
                    <arg value="coverage" />
                    <arg value="@{emma.enabled}" />
+                <extra-instrument-args />
                 <arg value="${application.package.to.instrument}/${test.runner}" />
             </exec>
         </sequential>
@@ -68,7 +70,13 @@
     <target name="coverage" depends="-set-coverage-classpath, -install-instrumented, install"
                 description="Runs the tests against the instrumented code and generates
                             code coverage report">
-        <run-tests-helper emma.enabled="true" />
+        <run-tests-helper emma.enabled="true">
+            <extra-instrument-args>
+                <arg value="-e" />
+                   <arg value="coverageFile" />
+                   <arg value="${emma.dump.file}" />
+            </extra-instrument-args>
+        </run-tests-helper>
         <echo>Downloading coverage file into project directory...</echo>
         <exec executable="${adb}" failonerror="true">
             <arg value="pull" />