Remove org.apache.http.legacy from bootclasspath
Updates the tests to work when org.apache.http.legacy is no longer on the
bootclasspath.
1) Added new test to verify that the org.apache.http classes are visible
to an APK that is targeted at an earlier release (27).
2) Modified CtsApacheHttpLegacyCurrentApiSignatureTestCases to verify
that the org.apache.http classes are not visible to an APK that is
targeted at the current release.
3) Added new test to verify that the org.apache.http classes are visible
to an APK that is targeted at the current release which has a
<uses-library android:name="org.apache.http.legacy"/> entry in its
manifest.
Change-Id: Id405add9e560c91d513649c2aeebc6ec24cb77ba
Test: cts/tests/signature/runSignatureTests.sh
Bug: 18027885
diff --git a/tests/signature/api-check/apache-http-legacy-current-api/AndroidTest.xml b/tests/signature/api-check/apache-http-legacy-current-api/AndroidTest.xml
index 9002d39..418c881 100644
--- a/tests/signature/api-check/apache-http-legacy-current-api/AndroidTest.xml
+++ b/tests/signature/api-check/apache-http-legacy-current-api/AndroidTest.xml
@@ -21,9 +21,6 @@
<option name="teardown-command" value="rm -rf /data/local/tmp/signature-test" />
</target_preparer>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
- <option name="push" value="current.api->/data/local/tmp/signature-test/current.api" />
- </target_preparer>
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="push" value="apache-http-legacy-minus-current.api->/data/local/tmp/signature-test/apache-http-legacy-minus-current.api" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
@@ -34,8 +31,7 @@
<option name="package" value="android.signature.cts.api.apache_http_legacy_current" />
<option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
<option name="class" value="android.signature.cts.api.SignatureTest" />
- <option name="instrumentation-arg" key="base-api-files" value="current.api" />
- <option name="instrumentation-arg" key="expected-api-files" value="apache-http-legacy-minus-current.api" />
+ <option name="instrumentation-arg" key="unexpected-api-files" value="apache-http-legacy-minus-current.api" />
<option name="runtime-hint" value="5s" />
</test>
</configuration>