summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-04-09 22:03:45 -0700
committerYing Wang <wangying@google.com>2013-04-09 22:03:45 -0700
commit083b5ccba345ed2b4950454f16bd89c5d86b6b27 (patch)
tree4ee4bf33ff25e4ffbb9c06bacce9507ed6d14997
parent7716aef138e8029357a7b3dc6a73b41f4de4b0ad (diff)
downloadcore-083b5ccba345ed2b4950454f16bd89c5d86b6b27.tar.gz
Add liblog
Bug: 8580410 Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
-rw-r--r--charger/Android.mk2
-rw-r--r--debuggerd/Android.mk5
-rw-r--r--libcorkscrew/Android.mk4
-rw-r--r--libnetutils/Android.mk3
-rw-r--r--libpixelflinger/Android.mk4
-rw-r--r--libsysutils/Android.mk6
-rw-r--r--toolbox/Android.mk1
7 files changed, 14 insertions, 11 deletions
diff --git a/charger/Android.mk b/charger/Android.mk
index 02586042f..b9d3473cc 100644
--- a/charger/Android.mk
+++ b/charger/Android.mk
@@ -28,7 +28,7 @@ LOCAL_STATIC_LIBRARIES := libminui libpixelflinger_static libpng
ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)
LOCAL_STATIC_LIBRARIES += libsuspend
endif
-LOCAL_STATIC_LIBRARIES += libz libstdc++ libcutils libm libc
+LOCAL_STATIC_LIBRARIES += libz libstdc++ libcutils liblog libm libc
include $(BUILD_EXECUTABLE)
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index 3fca64f4b..8621e9cb6 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -25,6 +25,7 @@ endif # ARCH_ARM_HAVE_VFP_D32
LOCAL_SHARED_LIBRARIES := \
libcutils \
+ liblog \
libc \
libcorkscrew \
libselinux
@@ -39,7 +40,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -fstack-protector-all
#LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_SHARED_LIBRARIES := libcutils libc
+LOCAL_SHARED_LIBRARIES := libcutils liblog libc
include $(BUILD_EXECUTABLE)
ifeq ($(ARCH_ARM_HAVE_VFP),true)
@@ -54,7 +55,7 @@ LOCAL_SRC_FILES := vfp-crasher.c vfp.S
LOCAL_MODULE := vfp-crasher
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := libcutils libc
+LOCAL_SHARED_LIBRARIES := libcutils liblog libc
include $(BUILD_EXECUTABLE)
endif # ARCH_ARM_HAVE_VFP == true
diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk
index 2786d8fe5..837078934 100644
--- a/libcorkscrew/Android.mk
+++ b/libcorkscrew/Android.mk
@@ -49,7 +49,7 @@ LOCAL_SRC_FILES += \
LOCAL_CFLAGS += -DCORKSCREW_HAVE_ARCH
endif
-LOCAL_SHARED_LIBRARIES += libdl libcutils libgccdemangle
+LOCAL_SHARED_LIBRARIES += libdl libcutils liblog libgccdemangle
LOCAL_CFLAGS += -std=gnu99 -Werror
LOCAL_MODULE := libcorkscrew
@@ -74,7 +74,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES += $(generic_src_files) $(x86_src_files)
LOCAL_CFLAGS += -DCORKSCREW_HAVE_ARCH
LOCAL_SHARED_LIBRARIES += libgccdemangle
-LOCAL_STATIC_LIBRARIES += libcutils
+LOCAL_STATIC_LIBRARIES += libcutils liblog
LOCAL_LDLIBS += -ldl -lrt
LOCAL_CFLAGS += -std=gnu99 -Werror
LOCAL_MODULE := libcorkscrew
diff --git a/libnetutils/Android.mk b/libnetutils/Android.mk
index 5f5849fcc..aba462184 100644
--- a/libnetutils/Android.mk
+++ b/libnetutils/Android.mk
@@ -9,7 +9,8 @@ LOCAL_SRC_FILES:= \
packet.c
LOCAL_SHARED_LIBRARIES := \
- libcutils
+ libcutils \
+ liblog
LOCAL_MODULE:= libnetutils
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index 85d2c9cf0..7f20e5bb4 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -50,7 +50,7 @@ PIXELFLINGER_SRC_FILES += arch-mips/t32cb16blend.S
PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer
endif
-LOCAL_SHARED_LIBRARIES := libcutils
+LOCAL_SHARED_LIBRARIES := libcutils liblog
#
# Shared library
@@ -75,7 +75,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE:= libpixelflinger_static
LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)
-LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
+LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
include $(BUILD_STATIC_LIBRARY)
diff --git a/libsysutils/Android.mk b/libsysutils/Android.mk
index 57cc313de..1d396b2ad 100644
--- a/libsysutils/Android.mk
+++ b/libsysutils/Android.mk
@@ -16,11 +16,11 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE:= libsysutils
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
+LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
-LOCAL_CFLAGS :=
+LOCAL_CFLAGS :=
-LOCAL_SHARED_LIBRARIES := libcutils
+LOCAL_SHARED_LIBRARIES := libcutils liblog
include $(BUILD_SHARED_LIBRARY)
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 2ecb62644..c7646902c 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -88,6 +88,7 @@ LOCAL_C_INCLUDES := bionic/libc/bionic
LOCAL_SHARED_LIBRARIES := \
libcutils \
+ liblog \
libc \
libusbhost \
libselinux