Merge "Revert "Push OverlayDeviceTests onto /system""

core/tests/overlaytests/device/Android.bp

@@ -16,11 +16,7 @@ android_test {
     name: "OverlayDeviceTests",
     srcs: ["src/**/*.java"],
     platform_apis: true,
-    certificate: "platform",
-    static_libs: [
-        "androidx.test.rules",
-        "testng",
-    ],
+    static_libs: ["androidx.test.rules"],
     test_suites: ["device-tests"],
     data: [
         ":OverlayDeviceTests_AppOverlayOne",

core/tests/overlaytests/device/AndroidManifest.xml

@@ -19,8 +19,6 @@
 
     <uses-sdk android:minSdkVersion="21" />
 
-    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />
-
     <application>
         <uses-library android:name="android.test.runner"/>
     </application>

core/tests/overlaytests/device/AndroidTest.xml

@@ -19,20 +19,9 @@
     <option name="test-suite-tag" value="apct" />
     <option name="test-suite-tag" value="apct-instrumentation" />
 
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-        <option name="remount-system" value="true" />
-        <option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" />
-    </target_preparer>
-  
-    <!-- Reboot to have the test APK scanned by PM and reboot after to remove the test APK. -->
-    <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer">
-      <option name="pre-reboot" value="true" />
-      <option name="post-reboot" value="true" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
         <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="OverlayDeviceTests.apk" />
         <option name="test-file-name" value="OverlayDeviceTests_AppOverlayOne.apk" />
         <option name="test-file-name" value="OverlayDeviceTests_AppOverlayTwo.apk" />
         <option name="test-file-name" value="OverlayDeviceTests_FrameworkOverlay.apk" />

core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp

@@ -15,6 +15,6 @@
 android_test {
     name: "OverlayDeviceTests_AppOverlayOne",
     sdk_version: "current",
-    certificate: "platform",
+
     aaptflags: ["--no-resource-removal"],
 }

core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp

@@ -15,6 +15,6 @@
 android_test {
     name: "OverlayDeviceTests_AppOverlayTwo",
     sdk_version: "current",
-    certificate: "platform",
+
     aaptflags: ["--no-resource-removal"],
 }