summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yike Zhang <yikezh@google.com> 2022-07-27 00:10:30 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-07-27 00:10:30 +0000
commitb0c1ec7c721c0a2021ee5b541aa3e044255d40c0 (patch)
treef2d9de72185bc1ef99cf6719e60ed568802ec04f
parent81df5357e69a8ac15582f7ae0d18a951012550f6 (diff)
parent55f2c7f1a13cc933f4047f0736b536a04918480e (diff)
Merge "Fix test dependencies for AppEnumerationInternalTests"
-rw-r--r--services/tests/PackageManagerServiceTests/appenumeration/Android.bp1
-rw-r--r--services/tests/PackageManagerServiceTests/appenumeration/AndroidTest.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/services/tests/PackageManagerServiceTests/appenumeration/Android.bp b/services/tests/PackageManagerServiceTests/appenumeration/Android.bp
index 479ef8e5f188..c3cce9619ae8 100644
--- a/services/tests/PackageManagerServiceTests/appenumeration/Android.bp
+++ b/services/tests/PackageManagerServiceTests/appenumeration/Android.bp
@@ -33,4 +33,5 @@ android_test {
],
platform_apis: true,
test_suites: ["device-tests"],
+ data: [":AppEnumerationSyncProviderTestApp"],
}
diff --git a/services/tests/PackageManagerServiceTests/appenumeration/AndroidTest.xml b/services/tests/PackageManagerServiceTests/appenumeration/AndroidTest.xml
index 6f168a3888b3..5bcf2e351662 100644
--- a/services/tests/PackageManagerServiceTests/appenumeration/AndroidTest.xml
+++ b/services/tests/PackageManagerServiceTests/appenumeration/AndroidTest.xml
@@ -30,7 +30,7 @@
</target_preparer>
<!-- Load additional APKs onto device -->
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="push" value="AppEnumerationSyncProviderTestApp.apk->/data/local/tmp/appenumerationtests/AppEnumerationSyncProviderTestApp.apk" />
</target_preparer>