diff options
| author | Ian Rogers <irogers@google.com> | 2016-05-03 17:19:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 17:19:18 +0000 |
| commit | 4f1eab48da53c3770282a9b19fc5b03168cae86e (patch) | |
| tree | 158f3856fb753884023ee573d0ebc04a95a4c091 | |
| parent | b30d05bb320cc03ffb994724f23bb356306ac684 (diff) | |
| parent | 18e4eccff3babfffafc79b949482bc10e749731e (diff) | |
| download | apache-http-android-8.0.0_r3.tar.gz | |
Merge "Add depedencies that allow error prone to compile source." am: bda9492f34 am: 5095ad9929 am: 949206634eandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
am: 18e4eccff3
* commit '18e4eccff3babfffafc79b949482bc10e749731e':
Add depedencies that allow error prone to compile source.
Change-Id: Ie9142a5a23f1ec13ddf8e74792387d4b8c3ac121
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -93,9 +93,9 @@ LOCAL_SRC_FILES += \ ../../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 \ |