From c796ed97466510dd5239008554decbe72825e19c Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 10 Apr 2013 17:27:35 -0700 Subject: [PATCH] We need libcutils to include liblog For some prebuilts were built against libcutils with liblog in it. Unfortunately that means in the future if someone checks in prebuilts that are built against libcutils and they don't explicitly link against liblog, they will again prevent us from removing liblog from libcutils. Bug: 8587800 Bug: 8580410 Change-Id: I2a5ed6233df7e7d542d1e4167bec405750c0e671 --- libcutils/Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 7931684d0..4056e8afb 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -142,7 +142,9 @@ include $(BUILD_STATIC_LIBRARY) 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)