commit 9fafa4a33d01f729078fb6800eaa951bb505e36a
author Eino-Ville Talvala <etalvala@google.com> Wed Apr 10 22:27:57 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 22:27:57 2013 +0000
tree 2362b85b8d89e775c4af7bb1b120a7c26ec87170
parent 9003b113d1a6746f3d3b225bfc127142714eb581
parent 7c9416b1880ae0507a6422646a6f162379cd094f

Merge "Camera3: Allow many calls to process_capture_result per request" into jb-mr2-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 7467bf2..aec6781 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SHARED_LIBRARIES := libcutils
+LOCAL_SHARED_LIBRARIES := libcutils liblog
 
 LOCAL_INCLUDES += $(LOCAL_PATH)
 

tests/camera2/Android.mk

diff --git a/tests/camera2/Android.mk b/tests/camera2/Android.mk
index 3daf9b8..b2ec41c 100644
--- a/tests/camera2/Android.mk
+++ b/tests/camera2/Android.mk
@@ -15,6 +15,7 @@
 	TestSettings.cpp \
 
 LOCAL_SHARED_LIBRARIES := \
+	liblog \
 	libutils \
 	libcutils \
 	libstlport \