commit 1420f2b4143e7d9afd9d3a8b60b0557a11b726c6
author Ying Wang <wangying@google.com> Wed Dec 16 11:42:37 2015 -0800
committer Ying Wang <wangying@google.com> Wed Dec 16 11:42:37 2015 -0800
tree 293376809d0823df1a9c920cf7006b65bf862c59
parent 7f064379fe72ac4caf50986d4fed1f4b123ee640

Fix ProGuard errors.

Fix ProGuard error "library class references program class" and
references of org.apache.http.legacy symobls.

Change-Id: I3a6e915b08ca5eabfa863580f489e3bf6b968e9f

Android.mk

diff --git a/Android.mk b/Android.mk
index 97570dc..745a2ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,6 +32,9 @@
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+# Guava uses deprecated org.apache.http.legacy classes.
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
+
 LOCAL_JNI_SHARED_LIBRARIES := libjni_tinyplanet libjni_jpegutil
 
 include $(BUILD_PACKAGE)