commit a14d6fda714e6d1c1578325eaec991032ce0558f
author Ying Wang <wangying@google.com> Thu Apr 11 15:59:22 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 11 15:59:22 2013 -0700
tree 1a389e9491c6127e4ccfd56e5e1da66dc8b12edf
parent bc7494fb7eab3e1d2a1c6942d127c1271c8be749
parent 821620f593bef6c9765fe6ee2973b0b8df0f2d40

am 821620f5: am c796ed97: We need libcutils to include liblog

* commit '821620f593bef6c9765fe6ee2973b0b8df0f2d40':
  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)