Remove poc dependency on AndroidTest.java

Bug: 171320823
Test: run all of STS
Change-Id: If2107a21dbc2dd112dfc1b760dfe5c13f98dee59
Merged-In: If2107a21dbc2dd112dfc1b760dfe5c13f98dee59
diff --git a/hostsidetests/securitybulletin/AndroidTest.xml b/hostsidetests/securitybulletin/AndroidTest.xml
index e29c6f1..b13bd50 100644
--- a/hostsidetests/securitybulletin/AndroidTest.xml
+++ b/hostsidetests/securitybulletin/AndroidTest.xml
@@ -16,290 +16,12 @@
 <configuration description="Config for the CTS Security bulletin host tests">
     <option name="test-suite-tag" value="cts" />
     <option name="config-descriptor:metadata" key="component" value="security" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-        <!--__________________-->
-        <!--    Utilities     -->
-        <option name="push" value="pacrunner->/data/local/tmp/pacrunner" />
-
-        <option name="push" value="CVE-2016-8460->/data/local/tmp/CVE-2016-8460" />
-        <option name="push" value="CVE-2016-8482->/data/local/tmp/CVE-2016-8482" />
-        <option name="push" value="CVE-2016-6730->/data/local/tmp/CVE-2016-6730" />
-        <option name="push" value="CVE-2016-6731->/data/local/tmp/CVE-2016-6731" />
-        <option name="push" value="CVE-2016-6732->/data/local/tmp/CVE-2016-6732" />
-        <option name="push" value="CVE-2016-6733->/data/local/tmp/CVE-2016-6733" />
-        <option name="push" value="CVE-2016-6734->/data/local/tmp/CVE-2016-6734" />
-        <option name="push" value="CVE-2016-6735->/data/local/tmp/CVE-2016-6735" />
-        <option name="push" value="CVE-2016-6736->/data/local/tmp/CVE-2016-6736" />
-        <option name="push" value="CVE-2016-8425->/data/local/tmp/CVE-2016-8425" />
-        <option name="push" value="CVE-2016-8426->/data/local/tmp/CVE-2016-8426" />
-        <option name="push" value="CVE-2016-8427->/data/local/tmp/CVE-2016-8427" />
-        <option name="push" value="CVE-2016-8428->/data/local/tmp/CVE-2016-8428" />
-        <option name="push" value="CVE-2016-8429->/data/local/tmp/CVE-2016-8429" />
-        <option name="push" value="CVE-2016-8430->/data/local/tmp/CVE-2016-8430" />
-        <option name="push" value="CVE-2016-8431->/data/local/tmp/CVE-2016-8431" />
-        <option name="push" value="CVE-2016-8432->/data/local/tmp/CVE-2016-8432" />
-        <option name="push" value="CVE-2016-8434->/data/local/tmp/CVE-2016-8434" />
-
-        <!--__________________-->
-        <!-- Bulletin 2015-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2015-3873->/data/local/tmp/CVE-2015-3873" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-0811->/data/local/tmp/CVE-2016-0811" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-04 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-2412->/data/local/tmp/CVE-2016-2412" />
-        <option name="push" value="CVE-2016-0844->/data/local/tmp/CVE-2016-0844" />
-        <option name="push" value="CVE-2016-2419->/data/local/tmp/CVE-2016-2419" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-05 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-2460->/data/local/tmp/CVE-2016-2460" />
-        <option name="push" value="CVE-2015-1805->/data/local/tmp/CVE-2015-1805" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-06 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-2485->/data/local/tmp/CVE-2016-2485" />
-        <option name="push" value="CVE-2016-2482->/data/local/tmp/CVE-2016-2482" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-07 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-3747->/data/local/tmp/CVE-2016-3747" />
-        <option name="push" value="CVE-2014-9803->/data/local/tmp/CVE-2014-9803" />
-        <option name="push" value="CVE-2016-3746->/data/local/tmp/CVE-2016-3746" />
-        <option name="push" value="CVE-2016-3818->/data/local/tmp/CVE-2016-3818" />
-
-        <!-- Bulletin 2016-09 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-2471->/data/local/tmp/CVE-2016-2471" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-3913->/data/local/tmp/CVE-2016-3913" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2012-6702->/data/local/tmp/CVE-2012-6702" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-12 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-
-        <!--__________________-->
-        <!-- Bulletin 2017-01 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0386->/data/local/tmp/CVE-2017-0386" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0415->/data/local/tmp/CVE-2017-0415" />
-        <option name="push" value="CVE-2017-0426->/data/local/tmp/CVE-2017-0426" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0477->/data/local/tmp/CVE-2017-0477" />
-        <option name="push" value="CVE-2017-0479->/data/local/tmp/CVE-2017-0479" />
-        <option name="push" value="CVE-2017-0334->/data/local/tmp/CVE-2017-0334" />
-        <option name="push" value="CVE-2016-8479->/data/local/tmp/CVE-2016-8479" />
-        <option name="push" value="CVE-2017-0508->/data/local/tmp/CVE-2017-0508" />
-        <option name="push" value="CVE-2017-0333->/data/local/tmp/CVE-2017-0333" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-04 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-10244->/data/local/tmp/CVE-2016-10244" />
-        <option name="push" value="CVE-2016-10229->/data/local/tmp/CVE-2016-10229" />
-        <option name="push" value="CVE-2014-3145->/data/local/tmp/CVE-2014-3145"/>
-        <option name="push" value="CVE-2017-0553->/data/local/tmp/CVE-2017-0553"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-05 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-5862->/data/local/tmp/CVE-2016-5862"/>
-        <option name="push" value="CVE-2016-5867->/data/local/tmp/CVE-2016-5867"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-06 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-4658->/data/local/tmp/CVE-2016-4658" />
-        <option name="push" value="CVE-2016-5131->/data/local/tmp/CVE-2016-5131" />
-        <option name="push" value="CVE-2016-8332->/data/local/tmp/CVE-2016-8332" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-07 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0697->/data/local/tmp/CVE-2017-0697"/>
-        <option name="push" value="CVE-2016-2109->/data/local/tmp/CVE-2016-2109"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-08 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0726->/data/local/tmp/CVE-2017-0726"/>
-        <option name="push" value="CVE-2017-0713->/data/local/tmp/CVE-2017-0713"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-09 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0670->/data/local/tmp/CVE-2017-0670" />
-        <option name="push" value="Bug-38195738->/data/local/tmp/Bug-38195738" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0814->/data/local/tmp/CVE-2017-0814" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-
-        <!--__________________-->
-        <!-- Bulletin 2017-12 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-6262->/data/local/tmp/CVE-2017-6262" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-01 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-13180->/data/local/tmp/CVE-2017-13180" />
-        <option name="push" value="CVE-2017-0817->/data/local/tmp/CVE-2017-0817" />
-        <option name="push" value="CVE-2018-9527->/data/local/tmp/CVE-2018-9527" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-13234->/data/local/tmp/CVE-2017-13234" />
-        <option name="push" value="CVE-2017-0837->/data/local/tmp/CVE-2017-0837" />
-        <option name="push" value="CVE-2017-13273->/data/local/tmp/CVE-2017-13273" />
-        <option name="push" value="CVE-2017-13232->/data/local/tmp/CVE-2017-13232" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-13253->/data/local/tmp/CVE-2017-13253" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-06 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9344->/data/local/tmp/CVE-2018-9344" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-07 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9428->/data/local/tmp/CVE-2018-9428" />
-        <option name="push" value="CVE-2018-9424->/data/local/tmp/CVE-2018-9424" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-09 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9466-CVE-2017-9047->/data/local/tmp/CVE-2018-9466-CVE-2017-9047" />
-        <option name="push" value="CVE-2018-9466-CVE-2017-9048->/data/local/tmp/CVE-2018-9466-CVE-2017-9048" />
-        <option name="push" value="CVE-2018-9466-CVE-2017-9049->/data/local/tmp/CVE-2018-9466-CVE-2017-9049" />
-        <option name="push" value="CVE-2018-9472->/data/local/tmp/CVE-2018-9472" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9491->/data/local/tmp/CVE-2018-9491" />
-        <option name="push" value="CVE-2018-9515->/data/local/tmp/CVE-2018-9515" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9537->/data/local/tmp/CVE-2018-9537" />
-        <option name="push" value="CVE-2018-9539->/data/local/tmp/CVE-2018-9539" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-1988->/data/local/tmp/CVE-2019-1988" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2007->/data/local/tmp/CVE-2019-2007" />
-        <option name="push" value="Bug-115739809->/data/local/tmp/Bug-115739809" />
-        <option name="push" value="CVE-2019-2025->/data/local/tmp/CVE-2019-2025" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-08 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2133->/data/local/tmp/CVE-2019-2133" />
-        <option name="push" value="CVE-2019-2134->/data/local/tmp/CVE-2019-2134" />
-        <option name="push" value="CVE-2019-2126->/data/local/tmp/CVE-2019-2126" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2184->/data/local/tmp/CVE-2019-2184" />
-
-        <!-- Bulletin 2019-12 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2228->/data/local/tmp/CVE-2019-2228" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-01 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0007->/data/local/tmp/CVE-2020-0007" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0069->/data/local/tmp/CVE-2020-0069" />
-
-        <!-- Bulletin 2020-05 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0101->/data/local/tmp/CVE-2020-0101" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0408->/data/local/tmp/CVE-2020-0408" />
-        <option name="push" value="CVE-2020-0421->/data/local/tmp/CVE-2020-0421" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0450->/data/local/tmp/CVE-2020-0450" />
-        <option name="push" value="CVE-2020-0409->/data/local/tmp/CVE-2020-0409" />
-
-        <option name="append-bitness" value="true" />
-    </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsHostLaunchAnyWhereApp.apk" />
     </target_preparer>
 
-    <!-- The following tests hit either 32-bit or 64-bit, but not both. All tests in this -->
-    <!-- section should take care to build either 32 bit or 64 bit binary, but not both.  -->
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-
-        <!-- Please add 32-bit binary tests below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-1317932->/data/local/tmp/CVE-2017-13179" />
-        <option name="push" value="CVE-2017-084032->/data/local/tmp/CVE-2017-0840" />
-        <option name="push" value="CVE-2017-1324132->/data/local/tmp/CVE-2017-13241" />
-        <option name="push" value="CVE-2016-390932->/data/local/tmp/CVE-2016-3909" />
-
-        <!-- Please add 64-bit binary tests below to avoid merge conflict -->
-
-
-        <option name="append-bitness" value="false" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="OomCatcher.apk" />
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
index 17713ac..085442e 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
@@ -368,6 +368,7 @@
     @SecurityTest(minPatchLevel = "2018-01")
     @Test
     public void testPocCVE_2017_13179() throws Exception {
+        pocPusher.only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13179", null, getDevice());
     }
 
@@ -528,6 +529,7 @@
     @SecurityTest(minPatchLevel = "2017-11")
     @Test
     public void testPocCVE_2017_0840() throws Exception {
+        pocPusher.only32();
         String processPatternStrings[] = {"media\\.codec", "omx@\\d+?\\.\\d+?-service"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-0840", null, getDevice(),
                 processPatternStrings);
@@ -540,6 +542,7 @@
     @SecurityTest(minPatchLevel = "2018-02")
     @Test
     public void testPocCVE_2017_13241() throws Exception {
+        pocPusher.only32();
         String processPatternStrings[] = {"media\\.codec", "omx@\\d+?\\.\\d+?-service"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13241", null, getDevice(),
                 processPatternStrings);
@@ -552,6 +555,7 @@
     @SecurityTest(minPatchLevel = "2016-10")
     @Test
     public void testPocCVE_2016_3909() throws Exception {
+        pocPusher.only32();
         String processPatternStrings[] = {"media\\.codec", "omx@\\d+?\\.\\d+?-service"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2016-3909", null, getDevice(),
                 processPatternStrings);