Move of OkHttp facade API to new package.
This CL moves the classes that make up this facade from
libcore.net.http
to
com.squareup.okhttp.internalandroidapi.
In jarjar'ed build targets, this becomes
com.android.okhttp.internalandroidapi.
This facade constitutes the API via which non-libcore parts
of the Android platform (currently framework) may access
OkHttp. It's moving because libcore.net.http is already
part of libcore, and the overlap of packages is problematic for
builds with EXPERIMENTAL_USE_OPENJDK9 set to true.
Http{,s}Handler are not currently imported by framework code;
this CL moves them back to com.android.okhttp. That package is
also where preloaded-classes still expected them to be.
Bug: 68220880
Test: CtsLibcoreOkHttpTestCases
Change-Id: I6f01c1d0f59db43290dac126f6b6ed2071d7708a
diff --git a/android/main/java/libcore/net/http/HttpHandler.java b/android/main/java/com/squareup/okhttp/HttpHandler.java
similarity index 93%
rename from android/main/java/libcore/net/http/HttpHandler.java
rename to android/main/java/com/squareup/okhttp/HttpHandler.java
index cf351ad..ef9a56b 100644
--- a/android/main/java/libcore/net/http/HttpHandler.java
+++ b/android/main/java/com/squareup/okhttp/HttpHandler.java
@@ -15,14 +15,8 @@
* limitations under the License.
*/
-package libcore.net.http;
+package com.squareup.okhttp;
-import com.squareup.okhttp.AndroidInternal;
-import com.squareup.okhttp.ConnectionSpec;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.OkUrlFactories;
-import com.squareup.okhttp.OkUrlFactory;
-import com.squareup.okhttp.ConfigAwareConnectionPool;
import com.squareup.okhttp.internal.URLFilter;
import libcore.net.NetworkSecurityPolicy;
import java.io.IOException;
diff --git a/android/main/java/libcore/net/http/HttpsHandler.java b/android/main/java/com/squareup/okhttp/HttpsHandler.java
similarity index 91%
rename from android/main/java/libcore/net/http/HttpsHandler.java
rename to android/main/java/com/squareup/okhttp/HttpsHandler.java
index c50611c..d4c0b8b 100644
--- a/android/main/java/libcore/net/http/HttpsHandler.java
+++ b/android/main/java/com/squareup/okhttp/HttpsHandler.java
@@ -15,16 +15,7 @@
* limitations under the License.
*/
-package libcore.net.http;
-
-import com.squareup.okhttp.CertificatePinner;
-import com.squareup.okhttp.ConnectionSpec;
-import com.squareup.okhttp.ConnectionSpecs;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.OkUrlFactories;
-import com.squareup.okhttp.OkUrlFactory;
-import com.squareup.okhttp.Protocol;
-import com.squareup.okhttp.ConfigAwareConnectionPool;
+package com.squareup.okhttp;
import java.net.Proxy;
import java.util.Collections;
diff --git a/android/main/java/libcore/net/http/Dns.java b/android/main/java/com/squareup/okhttp/internalandroidapi/Dns.java
similarity index 95%
rename from android/main/java/libcore/net/http/Dns.java
rename to android/main/java/com/squareup/okhttp/internalandroidapi/Dns.java
index e42c349..349fade 100644
--- a/android/main/java/libcore/net/http/Dns.java
+++ b/android/main/java/com/squareup/okhttp/internalandroidapi/Dns.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package libcore.net.http;
+package com.squareup.okhttp.internalandroidapi;
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git a/android/main/java/libcore/net/http/HttpURLConnectionFactory.java b/android/main/java/com/squareup/okhttp/internalandroidapi/HttpURLConnectionFactory.java
similarity index 97%
rename from android/main/java/libcore/net/http/HttpURLConnectionFactory.java
rename to android/main/java/com/squareup/okhttp/internalandroidapi/HttpURLConnectionFactory.java
index 050405c..f1da451 100644
--- a/android/main/java/libcore/net/http/HttpURLConnectionFactory.java
+++ b/android/main/java/com/squareup/okhttp/internalandroidapi/HttpURLConnectionFactory.java
@@ -14,9 +14,11 @@
* limitations under the License.
*/
-package libcore.net.http;
+package com.squareup.okhttp.internalandroidapi;
import com.squareup.okhttp.ConnectionPool;
+import com.squareup.okhttp.HttpHandler;
+import com.squareup.okhttp.HttpsHandler;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.OkUrlFactories;
import com.squareup.okhttp.OkUrlFactory;
diff --git a/android/main/java/com/squareup/okhttp/internalandroidapi/README b/android/main/java/com/squareup/okhttp/internalandroidapi/README
new file mode 100644
index 0000000..e332837
--- /dev/null
+++ b/android/main/java/com/squareup/okhttp/internalandroidapi/README
@@ -0,0 +1,5 @@
+This package contains a facade over OkHttp that some parts of Android framework are allowed to
+depend on. This is not a stable API; it is an attempt to decouple framework code from OkHttp as
+much as is practical where public APIs cannot be used.
+
+Please talk to the maintainers before adding any new dependencies.