diff options
author | Dario Freni <dariofreni@google.com> | 2019-05-23 14:21:06 +0100 |
---|---|---|
committer | Dario Freni <dariofreni@google.com> | 2019-05-23 14:21:06 +0100 |
commit | b7742a2696bff0695817c8938cec150385fd352e (patch) | |
tree | 08a796f978f023dd38e41730f69695dd97f19b2a | |
parent | 5331936773b9d101b73a682f312b1c0b23980297 (diff) | |
download | platform_system_apex-b7742a2696bff0695817c8938cec150385fd352e.tar.gz platform_system_apex-b7742a2696bff0695817c8938cec150385fd352e.tar.bz2 platform_system_apex-b7742a2696bff0695817c8938cec150385fd352e.zip |
Use SHIM for InstallApexModuleTargetPreparer test.
We're removing the ability of installing non-preinstalled APEX files via
adb.
Bug: 133306156
Bug: 132429173
Test: atest --test-mapping system/apex/tests
Change-Id: I9c47d9a29da51d61eeabfb1097a7cbbb6760e866
-rw-r--r-- | tests/Android.bp | 2 | ||||
-rw-r--r-- | tests/apex-targetprep-tests.xml | 2 |
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" /> |