summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-04-03 13:54:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 13:54:17 -0700
commit50bccad67cef5cebdd87d8fecb129b74d349ba53 (patch)
treecbabd271b50550e6651b1e6b55f392f2e748cdcb /Android.mk
parent565537c647d694128e41c44c086d0df09d36a50e (diff)
parent9dfbc2ec351f07b3e0215286d85541f4cd6d1b63 (diff)
downloadlibcore-50bccad67cef5cebdd87d8fecb129b74d349ba53.zip
libcore-50bccad67cef5cebdd87d8fecb129b74d349ba53.tar.gz
libcore-50bccad67cef5cebdd87d8fecb129b74d349ba53.tar.bz2
am 9dfbc2ec: Merge "Switch to OkHttp as URL\'s preferred HTTP implementation."
* commit '9dfbc2ec351f07b3e0215286d85541f4cd6d1b63': Switch to OkHttp as URL's preferred HTTP implementation.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a0599cf..d12bafd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,6 +66,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
core-hostdex \
bouncycastle-hostdex \
apache-xml-hostdex \
+ okhttp-hostdex \
apache-harmony-tests-hostdex \
$(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)/classes.jar
endif