From 320bb523a8f91d9206591e105962e27191c5f376 Mon Sep 17 00:00:00 2001
From: Yike <yikezh@google.com>
Date: Wed, 27 Jul 2022 13:00:55 +0800
Subject: [PATCH] Use `PushFilePreparer` to push files in OverlayDeviceTests

This change modifies the test config file by switching to use `PushFilePreparer` instead of `FilePusher`, since the `FilePusher` class which is defined in `compatibility-tradefed` is designed for the tests that are part of compatibility suite, but OverlayDeviceTests is not.

Bug: 220991354
Test: atest-src OverlayDeviceTests \
          --experimental-device-driven-test \
          --experimental-java-runtime-dependencies \
          --bazel-arg=--test_timeout=48000
Test: atest OverlayDeviceTests
Change-Id: Ice90776cb2eae43be25190979f1b69a52e97920d
---
 core/tests/overlaytests/device/AndroidTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tests/overlaytests/device/AndroidTest.xml b/core/tests/overlaytests/device/AndroidTest.xml
index 2d7d9b450c8cf..4099ec1f819df 100644
--- a/core/tests/overlaytests/device/AndroidTest.xml
+++ b/core/tests/overlaytests/device/AndroidTest.xml
@@ -20,7 +20,7 @@
     <option name="test-suite-tag" value="apct-instrumentation" />
 
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="remount-system" value="true" />
         <option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" />