commit 18e4eccff3babfffafc79b949482bc10e749731e
author Ian Rogers <irogers@google.com> Tue May 03 17:17:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 17:17:03 2016 +0000
tree 158f3856fb753884023ee573d0ebc04a95a4c091
parent 6cf93aa157511b78df57feefa5f941f408a9e4a4
parent 949206634ed87a0daebf1fcb153f74b3b77e21b6

Merge "Add depedencies that allow error prone to compile source." am: bda9492f34 am: 5095ad9929
am: 949206634e

* commit '949206634ed87a0daebf1fcb153f74b3b77e21b6':
  Add depedencies that allow error prone to compile source.

Change-Id: Ic3d58d21d39476be48b5332230ce8184b8058a68

Android.mk

diff --git a/Android.mk b/Android.mk
index f44b4d4..c348fdc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -93,9 +93,9 @@
     ../../frameworks/base/core/java/android/net/http/HttpResponseCache.java \
     ../../frameworks/base/core/java/android/net/http/SslCertificate.java \
     ../../frameworks/base/core/java/android/net/http/SslError.java \
+    ../../frameworks/base/core/java/com/android/internal/util/HexDump.java \
 
-
-LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
+LOCAL_JAVA_LIBRARIES := bouncycastle okhttp $(apache_http_java_libs)
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src \
   $(LOCAL_PATH)/android \