summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yike Zhang <yikezh@google.com> 2022-09-07 03:27:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 03:27:34 +0000
commit25334d16a45e6b103c84e9a4fb31c67352298b3b (patch)
tree7adeaa5ceeeb7ab6062787bde304555ad19be1f5
parentb157ddb8cdbf968504814fe11ffa6043547e6e25 (diff)
parent2570d996dbaba1512f9bec63f88b7bd761e6bcc3 (diff)
Merge "Use `PushFilePreparer` to push files in PreloadCheck" am: 6040384899 am: 2570d996db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2198760 Change-Id: I04913ce45215927a413bad4828e997ff22ca30b5 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