Merge "Include the okhttp.jar when compiling against internal classes"
diff --git a/core/config.mk b/core/config.mk
index 876161b..498c793 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -595,7 +595,7 @@
 
 # allow overriding default Java libraries on a per-target basis
 ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
-  TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework
+  TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework okhttp
 endif
 
 # Flags for DEX2OAT