OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
38c9024
)
Add an explicit dependency on org.apache.http.legacy.
author
Narayan Kamath
<narayan@google.com>
Fri, 13 Feb 2015 10:46:48 +0000
(10:46 +0000)
committer
Narayan Kamath
<narayan@google.com>
Fri, 13 Feb 2015 10:46:48 +0000
(10:46 +0000)
bug:
18027885
Change-Id: I94b14450807bdad2153078ac9a800863acf3177d
Android.mk
patch
|
blob
|
history
diff --git
a/Android.mk
b/Android.mk
index
8a50335
..
c592046
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-24,6
+24,10
@@
LOCAL_AAPT_FLAGS := \
--version-name "$(version_name_package)" \
--version-code $(version_code_package) \
+# Indirect dependency on apache due to glide, which pulls in
+# volley.
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
+
LOCAL_PACKAGE_NAME := Camera2
LOCAL_SDK_VERSION := current