commit 2570d996dbaba1512f9bec63f88b7bd761e6bcc3
author Yike Zhang <yikezh@google.com> Wed Sep 07 02:59:39 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 07 02:59:39 2022 +0000
tree a128589f55ec3ab48eff343847c53134f7a9c06e
parent a4c70add80294f3b7a737d06a2d3e34d25e280cf
parent 60403848997e359f5ef79da8befba0477cc57536

Merge "Use `PushFilePreparer` to push files in PreloadCheck" am: 6040384899

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2198760

Change-Id: I9d5b6669ea83aa3efbd50d51a3586c19d901a3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/preload-check/AndroidTest.xml

diff --git a/tools/preload-check/AndroidTest.xml b/tools/preload-check/AndroidTest.xml
index a0645d5..d486f0f 100644
--- a/tools/preload-check/AndroidTest.xml
+++ b/tools/preload-check/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for PreloadCheck">
-    <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="push" value="preload-check-device.jar->/data/local/tmp/preload-check-device.jar" />
     </target_preparer>

tools/preload-check/OWNERS

diff --git a/tools/preload-check/OWNERS b/tools/preload-check/OWNERS
new file mode 100644
index 0000000..e71c733
--- /dev/null
+++ b/tools/preload-check/OWNERS
@@ -0,0 +1 @@
+include /ZYGOTE_OWNERS