am 29674cb3: am 101ae8bf: Merge "Add liblog" into jb-mr2-dev
* commit '29674cb375de941e765dbd3e7d5aef4a884f2237':
Add liblog
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/Android.mk b/apps/CtsVerifier/jni/cameraanalyzer/Android.mk
index 2859074..ed66992 100644
--- a/apps/CtsVerifier/jni/cameraanalyzer/Android.mk
+++ b/apps/CtsVerifier/jni/cameraanalyzer/Android.mk
@@ -35,6 +35,6 @@
LOCAL_SHARED_LIBRARIES := libjnigraphics \
libstlport \
libcutils \
- libutils
+ libutils liblog
include $(BUILD_SHARED_LIBRARY)
diff --git a/suite/pts/deviceTests/opengl/jni/Android.mk b/suite/pts/deviceTests/opengl/jni/Android.mk
index be69522..8155bac 100644
--- a/suite/pts/deviceTests/opengl/jni/Android.mk
+++ b/suite/pts/deviceTests/opengl/jni/Android.mk
@@ -26,6 +26,6 @@
LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
-LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libandroid libutils libcutils
+LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libandroid libutils libcutils liblog
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)
diff --git a/suite/pts/deviceTests/opengl/test/Android.mk b/suite/pts/deviceTests/opengl/test/Android.mk
index 1939b2d..faf5f16 100644
--- a/suite/pts/deviceTests/opengl/test/Android.mk
+++ b/suite/pts/deviceTests/opengl/test/Android.mk
@@ -26,9 +26,9 @@
#$(info $(LOCAL_SRC_FILES))
LOCAL_C_INCLUDES += external/gtest/include $(LOCAL_PATH)/../jni/graphics/
-LOCAL_STATIC_LIBRARIES := libutils libcutils libgtest_host libgtest_main_host
+LOCAL_STATIC_LIBRARIES := libutils libcutils libgtest_host libgtest_main_host liblog
LOCAL_LDFLAGS:= -g -lrt -ldl -lstdc++ -lm -fno-exceptions
LOCAL_MODULE:= pts_device_opengl_test
include $(BUILD_HOST_EXECUTABLE)
-endif # linux
\ No newline at end of file
+endif # linux
diff --git a/tests/tests/nativemedia/sl/Android.mk b/tests/tests/nativemedia/sl/Android.mk
index 85b88ca..d999b57 100644
--- a/tests/tests/nativemedia/sl/Android.mk
+++ b/tests/tests/nativemedia/sl/Android.mk
@@ -18,6 +18,7 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
+ liblog \
libOpenSLES \
libstlport
diff --git a/tests/tests/nativemedia/xa/Android.mk b/tests/tests/nativemedia/xa/Android.mk
index 634bf4e..dad8acd 100644
--- a/tests/tests/nativemedia/xa/Android.mk
+++ b/tests/tests/nativemedia/xa/Android.mk
@@ -18,6 +18,7 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
+ liblog \
libOpenMAXAL \
libstlport
diff --git a/tests/tests/openglperf/jni/Android.mk b/tests/tests/openglperf/jni/Android.mk
index 77db1df..2cebaec 100644
--- a/tests/tests/openglperf/jni/Android.mk
+++ b/tests/tests/openglperf/jni/Android.mk
@@ -24,7 +24,7 @@
LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) $(call include-path-for, system-core) frameworks/native/opengl/include
-LOCAL_SHARED_LIBRARIES := libnativehelper libcutils libGLES_trace libEGL
+LOCAL_SHARED_LIBRARIES := libnativehelper libcutils liblog libGLES_trace libEGL
LOCAL_SDK_VERSION := 14