commit 821620f593bef6c9765fe6ee2973b0b8df0f2d40
author Ying Wang <wangying@google.com> Thu Apr 11 15:57:35 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 11 15:57:35 2013 -0700
tree f6010f6abd74fd526a5640a13612c4acccc768a2
parent cdbddac7b62c78a998ffce85f6a0e9b2209421f2
parent c796ed97466510dd5239008554decbe72825e19c

am c796ed97: We need libcutils to include liblog

* commit 'c796ed97466510dd5239008554decbe72825e19c':
  We need libcutils to include liblog

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 7c661bb..5037705 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -146,7 +146,9 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libcutils
-LOCAL_WHOLE_STATIC_LIBRARIES := libcutils
+# TODO: remove liblog as whole static library, once we don't have prebuilt that requires
+# liblog symbols present in libcutils.
+LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_CFLAGS += $(targetSmpFlag)
 LOCAL_C_INCLUDES := $(libcutils_c_includes)