Merge "Update AndroidTest to work with apct-suite setup" into pi-dev

     limitations under the License.

-->

<configuration description="Runs Frameworks Core Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="FrameworksCoreTests.apk" />

        <option name="test-file-name" value="BstatsTestApp.apk" />

    </target_preparer>

    <option name="test-suite-tag" value="apct" />

    <option name="test-tag" value="FrameworksCoreTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.frameworks.coretests" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

    </test>

</configuration>