Split old sdk apks in CtsWindowManagerDeviceTestCases
Avoid using --instant flag for apk compiled for older sdk.
They will be forced in full mode.
rest of the CL is from ag/4264889.
Test: cts-instant -m CtsWindowManagerDeviceTestCases
Bug: 79489186
Change-Id: I58498364279ec288cb5277ceb7fe88a2f9011e22
diff --git a/tests/framework/base/windowmanager/AndroidTest.xml b/tests/framework/base/windowmanager/AndroidTest.xml
index 624d4e6..337ada0 100644
--- a/tests/framework/base/windowmanager/AndroidTest.xml
+++ b/tests/framework/base/windowmanager/AndroidTest.xml
@@ -22,11 +22,16 @@
<option name="test-file-name" value="CtsWindowManagerDeviceTestCases.apk"/>
<option name="test-file-name" value="CtsDragAndDropSourceApp.apk"/>
<option name="test-file-name" value="CtsDragAndDropTargetApp.apk"/>
- <option name="test-file-name" value="CtsDragAndDropTargetAppSdk23.apk"/>
<option name="test-file-name" value="CtsDeviceAlertWindowTestApp.apk"/>
- <option name="test-file-name" value="CtsDeviceAlertWindowTestAppSdk25.apk"/>
<option name="test-file-name" value="CtsAlertWindowService.apk"/>
</target_preparer>
+ <!-- Some older apk cannot be installed as instant, so we force them full mode -->
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true"/>
+ <option name="force-install-mode" value="FULL"/>
+ <option name="test-file-name" value="CtsDragAndDropTargetAppSdk23.apk"/>
+ <option name="test-file-name" value="CtsDeviceAlertWindowTestAppSdk25.apk"/>
+ </target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
<option name="package" value="android.server.cts.wm"/>
<option name="runtime-hint" value="8m"/>