diff options
| author | Ying Wang <wangying@google.com> | 2013-04-09 23:25:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-09 23:25:24 -0700 |
| commit | 39f6dd65f9be1aeb40438dac180ab046e4b8a335 (patch) | |
| tree | 858bb5c0b699bf3fbc50fee29d5d6f673161350c | |
| parent | 5cad7119761d3074497fbf33f2cd5854ae5c19d6 (diff) | |
| parent | 129b6d907b3c32a0f0a2e4fc585502484d47a1e4 (diff) | |
| download | system_core-39f6dd65f9be1aeb40438dac180ab046e4b8a335.zip system_core-39f6dd65f9be1aeb40438dac180ab046e4b8a335.tar.gz system_core-39f6dd65f9be1aeb40438dac180ab046e4b8a335.tar.bz2 | |
am 129b6d90: am 083b5ccb: Add liblog
* commit '129b6d907b3c32a0f0a2e4fc585502484d47a1e4':
Add liblog
| -rw-r--r-- | charger/Android.mk | 2 | ||||
| -rw-r--r-- | debuggerd/Android.mk | 5 | ||||
| -rw-r--r-- | libcorkscrew/Android.mk | 4 | ||||
| -rw-r--r-- | libnetutils/Android.mk | 3 | ||||
| -rw-r--r-- | libpixelflinger/Android.mk | 4 | ||||
| -rw-r--r-- | libsysutils/Android.mk | 6 | ||||
| -rw-r--r-- | toolbox/Android.mk | 1 |
7 files changed, 14 insertions, 11 deletions
diff --git a/charger/Android.mk b/charger/Android.mk index 0258604..b9d3473 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 3fca64f..8621e9c 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 2786d8f..8370789 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 5f5849f..aba4621 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 85d2c9c..7f20e5b 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 57cc313..1d396b2 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 677539f..565ec2a 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -87,6 +87,7 @@ LOCAL_C_INCLUDES := bionic/libc/bionic LOCAL_SHARED_LIBRARIES := \ libcutils \ + liblog \ libc \ libusbhost \ libselinux |