OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ours...
[android-x86/packages-apps-Camera2.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
97570dc
..
745a2ad
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-32,6
+32,9
@@
LOCAL_SDK_VERSION := current
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)