commit 6155dba788849d90d96b05acc63fa6d08d53e95e
author Ying Wang <wangying@google.com> Wed Apr 10 05:17:30 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 05:17:31 2013 +0000
tree 028d96b3d9a52f1b17965abf1f224f323accb5df
parent 2df036b89596698b66ebddfead0eeb08360df5f8
parent b2411816414d33e5c3dd1488be1702b3ef67b250

Merge "Add liblog" into jb-mr2-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 1c71962..42a018e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,7 +36,7 @@
 
 
 LOCAL_SHARED_LIBRARIES += libRS libRSCpuRef
-LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2
+LOCAL_SHARED_LIBRARIES += liblog libcutils libutils libEGL libGLESv1_CM libGLESv2
 LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libLLVM libui libgui libsync
 
 LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
@@ -147,7 +147,7 @@
 	rsThreadIO.cpp \
 	rsType.cpp
 
-LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2 libbcc
+LOCAL_SHARED_LIBRARIES += liblog libcutils libutils libEGL libGLESv1_CM libGLESv2 libbcc
 LOCAL_SHARED_LIBRARIES += libui libbcinfo libLLVM libgui libsync libdl
 
 LOCAL_STATIC_LIBRARIES := libft2
@@ -239,7 +239,7 @@
 	rsThreadIO.cpp \
 	rsType.cpp
 
-LOCAL_STATIC_LIBRARIES := libcutils libutils
+LOCAL_STATIC_LIBRARIES := libcutils libutils liblog
 
 LOCAL_LDLIBS := -lpthread
 
@@ -328,6 +328,7 @@
 LOCAL_STATIC_LIBRARIES := \
   librsloader \
   libcutils \
+  liblog \
   libLLVMSupport
 
 LOCAL_SRC_FILES := \
@@ -362,6 +363,7 @@
 LOCAL_STATIC_LIBRARIES := \
   librsloader \
   libcutils \
+  liblog \
   libLLVMSupport
 
 LOCAL_SRC_FILES := \
@@ -448,4 +450,3 @@
 
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
-

cpp/Android.mk

diff --git a/cpp/Android.mk b/cpp/Android.mk
index 1fba998..145f487 100644
--- a/cpp/Android.mk
+++ b/cpp/Android.mk
@@ -27,7 +27,8 @@
 	libRS \
 	libz \
 	libcutils \
-	libutils
+	libutils \
+	liblog
 
 LOCAL_MODULE:= libRScpp
 
@@ -44,4 +45,3 @@
 
 
 include $(BUILD_SHARED_LIBRARY)
-

cpu_ref/Android.mk

diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index 685969f..67e0786 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -40,7 +40,7 @@
     LOCAL_CFLAGS += -DARCH_ARM_HAVE_VFP
 endif
 
-LOCAL_SHARED_LIBRARIES += libRS libcutils libutils libsync
+LOCAL_SHARED_LIBRARIES += libRS libcutils libutils liblog libsync
 LOCAL_SHARED_LIBRARIES += libbcc libbcinfo
 
 LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
@@ -52,5 +52,3 @@
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
-
-