RESTRICT AUTOMERGE: Fix FilePusher xml for ittiam tests
Bug: 72322539
Test: cts-tradefed run cts -m CtsSecurityBulletinHostTestCases
Verify the above command copies the ittiam files successfully (testavcdec32, testhevcdec32, testmpeg2dec32)
Change-Id: I986500a66a768b28df2a5ebd5d1a555952219dbe
diff --git a/hostsidetests/securitybulletin/AndroidTest.xml b/hostsidetests/securitybulletin/AndroidTest.xml
index e1a36c3..77f7ee3 100755
--- a/hostsidetests/securitybulletin/AndroidTest.xml
+++ b/hostsidetests/securitybulletin/AndroidTest.xml
@@ -35,12 +35,6 @@
<option name="push" value="CVE-2016-8432->/data/local/tmp/CVE-2016-8432" />
<option name="push" value="CVE-2016-2504->/data/local/tmp/CVE-2016-2504" />
- <!-- Media Codec Tests -->
- <!-- Please add tests for media codecs below to avoid merge conflict -->
- <option name="push" value="testhevcdec->/data/local/tmp/testhevcdec" />
- <option name="push" value="testavcdec->/data/local/tmp/testavcdec" />
- <option name="push" value="testmpeg2dec->/data/local/tmp/testmpeg2dec" />
-
<!--__________________-->
<!-- Bulletin 2015-12 -->
<!-- Please add tests solely from this bulletin below to avoid merge conflict -->
@@ -168,6 +162,24 @@
<option name="append-bitness" value="true" />
</target_preparer>
+ <!-- Support for 64-bit software codecs has been deprecated, -->
+ <!-- Hence tests which use them will be built only for 32-bit architectures. -->
+ <!-- The default 'target_preparer' tries to copy both 64-bit and 32-bit binaries as -->
+ <!-- 'append=bitness' value is set to 'true'. In order to ensure that that only -->
+ <!-- 32-bit binaries are copied, a new 'target_preparer' section is added with -->
+ <!-- 'append-bitness' value set to false and additionally '32' has been added in the -->
+ <!-- end after the bug id. This ensures that it does not try to copy the unavailable -->
+ <!-- 64-bit binary. -->
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+ <option name="cleanup" value="true" />
+
+ <option name="push" value="testhevcdec32->/data/local/tmp/testhevcdec" />
+ <option name="push" value="testavcdec32->/data/local/tmp/testavcdec" />
+ <option name="push" value="testmpeg2dec32->/data/local/tmp/testmpeg2dec" />
+
+ <option name="append-bitness" value="false" />
+ </target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="OomCatcher.apk" />
