commit bb38f9060299b4fc3afab89d942c1d165b47b2b7
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 26 20:30:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 26 20:30:07 2016 +0000
tree a769c824e4f3f161efd427f6293ae37b676ac704
parent 9200a9aab71fd6e1feaffb0b85d9021bcc9d818e
parent cf06be50b28837b2fc39233871ce069e0a74ad01

Merge "libeffects: fix enum conversion warnings."

camera/cameraserver/Android.mk

diff --git a/camera/cameraserver/Android.mk b/camera/cameraserver/Android.mk
index 7e36c5e..c0d75f3 100644
--- a/camera/cameraserver/Android.mk
+++ b/camera/cameraserver/Android.mk
@@ -21,6 +21,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
 	libcameraservice \
+	liblog \
 	libcutils \
 	libutils \
 	libbinder \

media/libeffects/lvm/wrapper/Android.mk

diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk
index 68ba34c..4e38e3d 100644
--- a/media/libeffects/lvm/wrapper/Android.mk
+++ b/media/libeffects/lvm/wrapper/Android.mk
@@ -18,6 +18,7 @@
 LOCAL_STATIC_LIBRARIES += libmusicbundle
 
 LOCAL_SHARED_LIBRARIES := \
+     liblog \
      libcutils \
      libdl
 
@@ -47,6 +48,7 @@
 LOCAL_STATIC_LIBRARIES += libreverb
 
 LOCAL_SHARED_LIBRARIES := \
+     liblog \
      libcutils \
      libdl
 

media/mediaserver/Android.mk

diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 1738df8..f3f3b1a 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -19,6 +19,7 @@
 	libcamera_client \
 	libcameraservice \
 	libresourcemanagerservice \
+	liblog \
 	libcutils \
 	libmedia \
 	libmediaplayerservice \