summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-29 03:10:50 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-29 03:10:50 +0000
commit7ffc23da26937acc1429cde60b13949a81a3997f (patch)
tree08a796f978f023dd38e41730f69695dd97f19b2a
parentca19d00b2d8f87c5bbbe0e5cf0bdf67e0998be59 (diff)
parentb7742a2696bff0695817c8938cec150385fd352e (diff)
downloadplatform_system_apex-7ffc23da26937acc1429cde60b13949a81a3997f.tar.gz
platform_system_apex-7ffc23da26937acc1429cde60b13949a81a3997f.tar.bz2
platform_system_apex-7ffc23da26937acc1429cde60b13949a81a3997f.zip
Snap for 5612356 from b7742a2696bff0695817c8938cec150385fd352e to qt-release
Change-Id: I1ca150e005a530ed363b9a44248199a2545bee36
-rw-r--r--tests/Android.bp2
-rw-r--r--tests/apex-targetprep-tests.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index 6f514728..6b2438d1 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -94,7 +94,7 @@ java_test_host {
srcs: ["src/**/ApexTargetPrepTest.java"],
- data: [":apex.test"],
+ data: [":StagedInstallTestApexV2"],
test_config: "apex-targetprep-tests.xml",
diff --git a/tests/apex-targetprep-tests.xml b/tests/apex-targetprep-tests.xml
index 58d4d63b..6862720c 100644
--- a/tests/apex-targetprep-tests.xml
+++ b/tests/apex-targetprep-tests.xml
@@ -19,7 +19,7 @@
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.tradefed.targetprep.InstallApexModuleTargetPreparer" >
- <option name="test-file-name" value="apex.test.apex" />
+ <option name="test-file-name" value="com.android.apex.cts.shim.v2.apex" />
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
<option name="jar" value="apex_targetprep_tests.jar" />