From 118ddbccc90d1d2e527882a795cdd7d45580739d Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <rtmitchell@google.com>
Date: Tue, 12 Jan 2021 21:10:19 +0000
Subject: [PATCH] Revert "Push OverlayDeviceTests onto /system"

This reverts commit 2b1b3b282f620c15025fb5c449ed35a0f1db304b.

Reason for revert: b/177065099

Change-Id: I0ac8d525c9f36ace5e65ffb2305f75fef0b6dc65
---
 core/tests/overlaytests/device/Android.bp           |  6 +-----
 core/tests/overlaytests/device/AndroidManifest.xml  |  2 --
 core/tests/overlaytests/device/AndroidTest.xml      | 13 +------------
 .../device/test-apps/AppOverlayOne/Android.bp       |  2 +-
 .../device/test-apps/AppOverlayTwo/Android.bp       |  2 +-
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/core/tests/overlaytests/device/Android.bp b/core/tests/overlaytests/device/Android.bp
index f86ac9ce37e11..12a2b08150501 100644
--- a/core/tests/overlaytests/device/Android.bp
+++ b/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",
diff --git a/core/tests/overlaytests/device/AndroidManifest.xml b/core/tests/overlaytests/device/AndroidManifest.xml
index a69911f8d827d..4881636c70956 100644
--- a/core/tests/overlaytests/device/AndroidManifest.xml
+++ b/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>
diff --git a/core/tests/overlaytests/device/AndroidTest.xml b/core/tests/overlaytests/device/AndroidTest.xml
index db45750ff6dc6..6507839a42889 100644
--- a/core/tests/overlaytests/device/AndroidTest.xml
+++ b/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" />
diff --git a/core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp b/core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
index 847b4915530bc..da3aa007135ac 100644
--- a/core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
+++ b/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"],
 }
diff --git a/core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp b/core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
index 7d5f82a71b442..215b66da36dce 100644
--- a/core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
+++ b/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"],
 }