summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yike Zhang <yikezh@google.com> 2022-09-07 04:50:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 04:50:27 +0000
commit22ab071a7b2130e27002c0140f0c7a83be1d969a (patch)
tree91c7f57910b1447dd1dc06fc6d965c9b70bf937d
parente33f3f093fcbaf8564c5e6f11258e45cc9f996cc (diff)
parent6d6aab88760ee5077d989907c5fdb42fec047389 (diff)
Merge "Use `PushFilePreparer` to push files in PreloadCheck" am: 6040384899 am: 2570d996db am: 25334d16a4 am: 9752c82ef0 am: 6d6aab8876
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2198760 Change-Id: I621ed42e47b2cdcc99ccd58ef51837750d7836e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tools/preload-check/AndroidTest.xml2
-rw-r--r--tools/preload-check/OWNERS1
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/preload-check/AndroidTest.xml b/tools/preload-check/AndroidTest.xml
index a0645d5b1051..d486f0f914c6 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>
diff --git a/tools/preload-check/OWNERS b/tools/preload-check/OWNERS
new file mode 100644
index 000000000000..e71c7332ca90
--- /dev/null
+++ b/tools/preload-check/OWNERS
@@ -0,0 +1 @@
+include /ZYGOTE_OWNERS