From 48d6d1ed5f2ad6aa8ee3ec932f4bd7f9b4238672 Mon Sep 17 00:00:00 2001
From: Stuart Scott <stuartscott@google.com>
Date: Mon, 5 Oct 2015 17:37:41 -0700
Subject: [PATCH] Remove common-config and switch to AndroidJUnitTest.

bug:21762834
Change-Id: I17e1b44e4429a3fbeb9f110a74038e4ec306af38
---
 tests/cts/net/AndroidTest.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/cts/net/AndroidTest.xml b/tests/cts/net/AndroidTest.xml
index 1736151480..5d38c64a13 100644
--- a/tests/cts/net/AndroidTest.xml
+++ b/tests/cts/net/AndroidTest.xml
@@ -12,15 +12,16 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Test module config for net apis">
-    <include name="common-config" />
+<configuration description="Config for CTS Net test cases">
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkPreconditionCheck">
         <option name="apk" value="CtsNetPreconditions.apk"/>
         <option name="package" value="android.net.preconditions"/>
     </target_preparer>
-    <option name="apk-installer:test-file-name" value="CtsNetTestCases.apk" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsNetTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.net.cts" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>
 </configuration>