ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Add liblog" into jb-mr2-dev

Browse Source
This commit is contained in:
Ying Wang 2013-04-10 05:17:07 +00:00 committed by Android (Google) Code Review
commit c76e8a20e2
18 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/dumpstate/Android.mk
View File

@ -9,7 +9,7 @@ LOCAL_SRC_FILES := dumpstate.c utils.c
LOCAL_MODULE := dumpstate LOCAL_MODULE := dumpstate
LOCAL_SHARED_LIBRARIES := libcutils LOCAL_SHARED_LIBRARIES := libcutils liblog
ifdef BOARD_LIB_DUMPSTATE ifdef BOARD_LIB_DUMPSTATE
LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE) LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE)

1
cmds/dumpsys/Android.mk
View File

@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
liblog \
libbinder libbinder

1
cmds/installd/Android.mk
View File

@ -30,6 +30,7 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
liblog \
libselinux libselinux
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \

2
cmds/ip-up-vpn/Android.mk
View File

@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := ip-up-vpn.c LOCAL_SRC_FILES := ip-up-vpn.c
LOCAL_SHARED_LIBRARIES := libcutils LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_MODULE := ip-up-vpn LOCAL_MODULE := ip-up-vpn
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ppp LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ppp
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional

2
cmds/screenshot/Android.mk
View File

@ -5,7 +5,7 @@ LOCAL_SRC_FILES := screenshot.c
LOCAL_MODULE := screenshot LOCAL_MODULE := screenshot
LOCAL_SHARED_LIBRARIES := libcutils libz LOCAL_SHARED_LIBRARIES := libcutils libz liblog
LOCAL_STATIC_LIBRARIES := libpng LOCAL_STATIC_LIBRARIES := libpng
LOCAL_C_INCLUDES += external/zlib LOCAL_C_INCLUDES += external/zlib

1
libs/gui/Android.mk
View File

@ -36,6 +36,7 @@ LOCAL_SHARED_LIBRARIES := \
libsync \ libsync \
libui \ libui \
libutils \ libutils \
liblog
LOCAL_MODULE:= libgui LOCAL_MODULE:= libgui

3
libs/ui/Android.mk
View File

@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware \ libhardware \
libsync \ libsync \
libutils libutils \
liblog
ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),) ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),)
LOCAL_CFLAGS += -DFRAMEBUFFER_FORCE_FORMAT=$(BOARD_FRAMEBUFFER_FORCE_FORMAT) LOCAL_CFLAGS += -DFRAMEBUFFER_FORCE_FORMAT=$(BOARD_FRAMEBUFFER_FORCE_FORMAT)

2
opengl/libagl/Android.mk
View File

@ -26,7 +26,7 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libagl\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_CFLAGS += -fvisibility=hidden LOCAL_CFLAGS += -fvisibility=hidden
LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils libpixelflinger libETC1 libui LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)

6
opengl/libs/Android.mk
View File

@ -32,7 +32,7 @@ LOCAL_SRC_FILES:= \
EGL/Loader.cpp \ EGL/Loader.cpp \
# #
LOCAL_SHARED_LIBRARIES += libcutils libutils libGLES_trace LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libGLES_trace
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libEGL LOCAL_MODULE:= libEGL
LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL
@ -85,7 +85,7 @@ LOCAL_SRC_FILES:= \
GLES_CM/gl.cpp.arm \ GLES_CM/gl.cpp.arm \
# #
LOCAL_SHARED_LIBRARIES += libcutils libEGL LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libGLESv1_CM LOCAL_MODULE:= libGLESv1_CM
@ -110,7 +110,7 @@ LOCAL_SRC_FILES:= \
GLES2/gl2.cpp.arm \ GLES2/gl2.cpp.arm \
# #
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libGLESv2 LOCAL_MODULE:= libGLESv2

2
opengl/libs/GLES_trace/Android.mk
View File

@ -22,7 +22,7 @@ LOCAL_C_INCLUDES := \
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf
LOCAL_SHARED_LIBRARIES := libcutils libutils libstlport LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libstlport
LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\"

1
opengl/tests/gl2_jni/Android.mk
View File

@ -37,6 +37,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
liblog \
libEGL \ libEGL \
libGLESv2 libGLESv2

1
opengl/tests/gl_jni/Android.mk
View File

@ -37,6 +37,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
liblog \
libEGL \ libEGL \
libGLESv1_CM libGLESv1_CM

3
opengl/tests/gl_perf/Android.mk
View File

@ -6,7 +6,8 @@ LOCAL_SRC_FILES:= \
filltest.cpp filltest.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
liblog \
libEGL \ libEGL \
libGLESv2 \ libGLESv2 \
libui libui

1
opengl/tests/gl_perfapp/Android.mk
View File

@ -40,6 +40,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
liblog \
libEGL \ libEGL \
libGLESv2 libGLESv2

1
opengl/tests/gldual/Android.mk
View File

@ -37,6 +37,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
liblog \
libEGL \ libEGL \
libGLESv2 libGLESv2

4
opengl/tests/hwc/Android.mk
View File

@ -40,6 +40,7 @@ LOCAL_SHARED_LIBRARIES := \
libEGL \ libEGL \
libGLESv2 \ libGLESv2 \
libutils \ libutils \
liblog \
libui \ libui \
libhardware \ libhardware \
@ -72,6 +73,7 @@ LOCAL_SHARED_LIBRARIES := \
libEGL \ libEGL \
libGLESv2 \ libGLESv2 \
libutils \ libutils \
liblog \
libui \ libui \
libhardware \ libhardware \
@ -102,6 +104,7 @@ LOCAL_SHARED_LIBRARIES := \
libEGL \ libEGL \
libGLESv2 \ libGLESv2 \
libutils \ libutils \
liblog \
libui \ libui \
libhardware \ libhardware \
@ -132,6 +135,7 @@ LOCAL_SHARED_LIBRARIES := \
libEGL \ libEGL \
libGLESv2 \ libGLESv2 \
libutils \ libutils \
liblog \
libui \ libui \
libhardware \ libhardware \

1
services/sensorservice/Android.mk
View File

@ -21,6 +21,7 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware \ libhardware \
libutils \ libutils \
liblog \
libbinder \ libbinder \
libui \ libui \
libgui libgui

2
services/surfaceflinger/Android.mk
View File

@ -44,6 +44,7 @@ endif
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
liblog \
libdl \ libdl \
libhardware \ libhardware \
libutils \ libutils \
@ -68,6 +69,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
liblog \
libdl libdl
LOCAL_MODULE:= libsurfaceflinger_ddmconnection LOCAL_MODULE:= libsurfaceflinger_ddmconnection