commit af439891e9778c6ebdf315b6d3f3cb3b927d1670
author Narayan Kamath <narayan@google.com> Wed Feb 11 14:48:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 11 14:48:03 2015 +0000
tree 2b0eaea6711c845dfdd0551cf420683cce4098b5
parent f8136017fa587d4cd5ff64d6a4422743d3038ae1
parent 2011e895dcd4e7185196e1061663f3d6b0031e15

Merge "Temporarily add org.apache.http.legacy to the boot classpath."

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 3ff0798..d1e5d81 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -93,6 +93,7 @@
     ims-common \
     mms-common \
     apache-xml \
+    org.apache.http.legacy
 
 # The order of PRODUCT_SYSTEM_SERVER_JARS matters.
 PRODUCT_SYSTEM_SERVER_JARS := \

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 2b00374..f66db8c 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -94,6 +94,7 @@
     mms-common \
     apache-xml \
     nullwebview \
+    org.apache.http.legacy
 
 # The order of PRODUCT_SYSTEM_SERVER_JARS matters.
 PRODUCT_SYSTEM_SERVER_JARS := \