Remove overlapping classes from apache-http-legacy-current.api
The following classes are in both the current.txt and the
apache-http-legacy-current.txt API descriptions:
* android.net.http.HttpResponseCache
* android.net.http.SslCertificate
* android.net.http.SslError
* org.apache.http.conn.ConnectTimeoutException
* org.apache.http.conn.scheme.HostNameResolver
* org.apache.http.conn.scheme.LayeredSocketFactory
* org.apache.http.conn.scheme.SocketFactory
* org.apache.http.params.CoreConnectionPNames
* org.apache.http.params.HttpConnectionParams
* org.apache.http.params.HttpParams
Having overlapping classes will make it difficult to ensure that the
classes provided by the org.apache.http.legacy library are no longer
present by default once it has been removed from the bootclasspath. The
test expects that none of the classes in the
apache-http-legacy-current.txt will be available but as the above
classes are provided by the framework.jar not the org.apache.http.legacy
library they will be found and cause the test to fail.
While removing those classes from the org.apache.http.legacy API
description and stubs jar is possible it would take quite a bit of time,
potentially cause disruption for developers and would not really provide
any benefit. Also, given that in future the above classes are likely to
be removed from the API and moved into the org.apache.http.legacy API it
would be a step in the wrong direction.
This change simply generates a new API description file for the
org.apache.http.legacy library that excludes those classes provided by
the framework library and updates the existing test to use that.
Verified that the classes listed above and only those classes were
removed from the generated api file.
Bug: 18027885
Test: tests/signature/runSignatureTests.sh
Change-Id: Ie53cf76636067f9b837ade81ad50bf959a4fe0ed
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 a5e69a9..a9db2b0 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
@@ -20,7 +20,7 @@
<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="apache-http-legacy-current.api->/data/local/tmp/signature-test/apache-http-legacy-current.api" />
+ <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">
<option name="cleanup-apks" value="true" />
@@ -29,7 +29,7 @@
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.signature.cts.api.apache_http_legacy_current" />
<option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
- <option name="instrumentation-arg" key="expected-api-files" value="apache-http-legacy-current.api" />
+ <option name="instrumentation-arg" key="expected-api-files" value="apache-http-legacy-minus-current.api" />
<option name="runtime-hint" value="5s" />
</test>
</configuration>