drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d8b26d6c: Merge "Add liblog" into jb-mr2-dev

Browse Source 
* commit 'd8b26d6c424741dd09cf70ee88fd237807aaf301':
  Add liblog
This commit is contained in:
Ying Wang
2013-04-09 22:28:51 -07:00
committed by Android Git Automerger
parent fd38ca2cdc d8b26d6c42
commit a976bddd9c
26 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/app_process/Android.mk
View File

@ -7,6 +7,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libutils \ libutils \
liblog \
libbinder \ libbinder \
libandroid_runtime libandroid_runtime
@ -27,6 +28,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libutils \ libutils \
liblog \
libbinder \ libbinder \
libandroid_runtime libandroid_runtime

1
cmds/bootanimation/Android.mk
View File

@ -9,6 +9,7 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
liblog \
libandroidfw \ libandroidfw \
libutils \ libutils \
libbinder \ libbinder \

4
cmds/system_server/Android.mk
View File

@ -7,7 +7,8 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
libbinder \ libbinder \
libsystem_server libsystem_server \
liblog
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) $(JNI_H_INCLUDE)
@ -17,4 +18,3 @@ LOCAL_MODULE:= system_server
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
include $(LOCAL_PATH)/library/Android.mk include $(LOCAL_PATH)/library/Android.mk

3
cmds/system_server/library/Android.mk
View File

@ -19,7 +19,8 @@ LOCAL_SHARED_LIBRARIES := \
libinput \ libinput \
libutils \ libutils \
libbinder \ libbinder \
libcutils libcutils \
liblog
LOCAL_MODULE:= libsystem_server LOCAL_MODULE:= libsystem_server

1
core/jni/Android.mk
View File

@ -179,6 +179,7 @@ LOCAL_SHARED_LIBRARIES := \
libandroidfw \ libandroidfw \
libexpat \ libexpat \
libnativehelper \ libnativehelper \
liblog \
libcutils \ libcutils \
libutils \ libutils \
libbinder \ libbinder \

2
drm/jni/Android.mk
View File

@ -23,6 +23,7 @@ LOCAL_MODULE:= libdrmframework_jni
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libdrmframework \ libdrmframework \
liblog \
libutils \ libutils \
libandroid_runtime \ libandroid_runtime \
libnativehelper \ libnativehelper \
@ -43,4 +44,3 @@ LOCAL_C_INCLUDES += \
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

1
graphics/jni/Android.mk
View File

@ -10,6 +10,7 @@ LOCAL_SHARED_LIBRARIES := \
libnativehelper \ libnativehelper \
libRS \ libRS \
libcutils \ libcutils \
liblog \
libskia \ libskia \
libutils \ libutils \
libui \ libui \

2
libs/hwui/Android.mk
View File

@ -58,7 +58,7 @@ ifeq ($(USE_OPENGL_RENDERER),true)
LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DGL_GLEXT_PROTOTYPES LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DGL_GLEXT_PROTOTYPES
LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui libRS libRScpp LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libGLESv2 libskia libui libRS libRScpp
LOCAL_MODULE := libhwui LOCAL_MODULE := libhwui
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional

1
media/jni/Android.mk
View File

@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := \
libmedia \ libmedia \
libskia \ libskia \
libui \ libui \
liblog \
libcutils \ libcutils \
libgui \ libgui \
libstagefright \ libstagefright \

1
media/jni/audioeffect/Android.mk
View File

@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \
android_media_Visualizer.cpp android_media_Visualizer.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \ libcutils \
libutils \ libutils \
libandroid_runtime \ libandroid_runtime \

1
media/jni/mediaeditor/Android.mk
View File

@ -52,6 +52,7 @@ LOCAL_SHARED_LIBRARIES := \
libaudioutils \ libaudioutils \
libbinder \ libbinder \
libcutils \ libcutils \
liblog \
libdl \ libdl \
libgui \ libgui \
libmedia \ libmedia \

1
media/jni/soundpool/Android.mk
View File

@ -5,6 +5,7 @@ LOCAL_SRC_FILES:= \
android_media_SoundPool.cpp android_media_SoundPool.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \ libcutils \
libutils \ libutils \
libandroid_runtime \ libandroid_runtime \

4
media/libdrm/mobile1/Android.mk
View File

@ -44,6 +44,7 @@ LOCAL_CFLAGS := $(LOCAL_DRM_CFLAG)
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
libcutils \ libcutils \
liblog \
libcrypto libcrypto
LOCAL_MODULE := libdrm1 LOCAL_MODULE := libdrm1
@ -74,7 +75,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := libdrm1 \ LOCAL_SHARED_LIBRARIES := libdrm1 \
libnativehelper \ libnativehelper \
libutils \ libutils \
libcutils libcutils \
liblog
LOCAL_MODULE := libdrm1_jni LOCAL_MODULE := libdrm1_jni

3
media/mca/filterfw/Android.mk
View File

@ -37,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := libstlport \
libdl \ libdl \
libcutils \ libcutils \
libutils \ libutils \
liblog \
libandroid \ libandroid \
libjnigraphics \ libjnigraphics \
libmedia libmedia
@ -48,5 +49,3 @@ LOCAL_SHARED_LIBRARIES := libstlport \
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
media/mca/filterpacks/Android.mk
View File

@ -46,10 +46,8 @@ LOCAL_SRC_FILES += native/imageproc/brightness.c \
native/imageproc/invert.c \ native/imageproc/invert.c \
native/imageproc/to_rgba.c native/imageproc/to_rgba.c
LOCAL_SHARED_LIBRARIES := libutils libfilterfw LOCAL_SHARED_LIBRARIES := liblog libutils libfilterfw
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

1
media/tests/omxjpegdecoder/Android.mk
View File

@ -29,6 +29,7 @@ LOCAL_SHARED_LIBRARIES := \
libstagefright_foundation \ libstagefright_foundation \
libbinder \ libbinder \
libutils \ libutils \
liblog \
libjpeg libjpeg
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \

3
media/tests/players/Android.mk
View File

@ -20,7 +20,8 @@ LOCAL_SRC_FILES:= invoke_mock_media_player.cpp
LOCAL_SHARED_LIBRARIES:= \ LOCAL_SHARED_LIBRARIES:= \
libbinder \ libbinder \
libutils libutils \
liblog
LOCAL_MODULE:= invoke_mock_media_player LOCAL_MODULE:= invoke_mock_media_player
LOCAL_MODULE_TAGS := tests eng LOCAL_MODULE_TAGS := tests eng

1
native/android/Android.mk
View File

@ -17,6 +17,7 @@ LOCAL_SRC_FILES:= \
storage_manager.cpp storage_manager.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \ libcutils \
libandroidfw \ libandroidfw \
libutils \ libutils \

3
packages/DefaultContainerService/jni/Android.mk
View File

@ -28,7 +28,8 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libnativehelper \ libnativehelper \
libutils libutils \
liblog
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libdiskusage libdiskusage

3
services/common_time/Android.mk
View File

@ -27,7 +27,8 @@ endif
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbinder \ libbinder \
libcommon_time_client \ libcommon_time_client \
libutils libutils \
liblog
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := common_time LOCAL_MODULE := common_time

1
services/input/Android.mk
View File

@ -29,6 +29,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
liblog \
libandroidfw \ libandroidfw \
libutils \ libutils \
libhardware \ libhardware \

1
services/input/tests/Android.mk
View File

@ -9,6 +9,7 @@ test_src_files := \
shared_libraries := \ shared_libraries := \
libcutils \ libcutils \
liblog \
libandroidfw \ libandroidfw \
libutils \ libutils \
libhardware \ libhardware \

1
services/jni/Android.mk
View File

@ -32,6 +32,7 @@ LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \ libandroid_runtime \
libandroidfw \ libandroidfw \
libcutils \ libcutils \
liblog \
libhardware \ libhardware \
libhardware_legacy \ libhardware_legacy \
libnativehelper \ libnativehelper \

4
tools/aapt/Android.mk
View File

@ -39,14 +39,14 @@ LOCAL_C_INCLUDES += external/libpng
LOCAL_C_INCLUDES += external/zlib LOCAL_C_INCLUDES += external/zlib
LOCAL_C_INCLUDES += build/libs/host/include LOCAL_C_INCLUDES += build/libs/host/include
#LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libhost \ libhost \
libandroidfw \ libandroidfw \
libutils \ libutils \
libcutils \ libcutils \
libexpat \ libexpat \
libpng libpng \
liblog
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt -ldl -lpthread LOCAL_LDLIBS += -lrt -ldl -lpthread

3
tools/obbtool/Android.mk
View File

@ -20,7 +20,8 @@ LOCAL_CFLAGS := -Wall -Werror
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libutils \ libutils \
libandroidfw \ libandroidfw \
libcutils libcutils \
liblog
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -ldl -lpthread LOCAL_LDLIBS += -ldl -lpthread

3
tools/validatekeymaps/Android.mk
View File

@ -20,7 +20,8 @@ LOCAL_CFLAGS := -Wall -Werror
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libandroidfw \ libandroidfw \
libutils \ libutils \
libcutils libcutils \
liblog
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -ldl -lpthread LOCAL_LDLIBS += -ldl -lpthread