diff options
26 files changed, 40 insertions, 21 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index b39c335..b9afe40 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ + liblog \ libbinder \ libandroid_runtime @@ -27,6 +28,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ + liblog \ libbinder \ libandroid_runtime diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk index 8c46b21..d5ff84e 100644 --- a/cmds/bootanimation/Android.mk +++ b/cmds/bootanimation/Android.mk @@ -9,6 +9,7 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_SHARED_LIBRARIES := \ libcutils \ + liblog \ libandroidfw \ libutils \ libbinder \ diff --git a/cmds/system_server/Android.mk b/cmds/system_server/Android.mk index ad537977..3083e31 100644 --- a/cmds/system_server/Android.mk +++ b/cmds/system_server/Android.mk @@ -7,7 +7,8 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder \ - libsystem_server + libsystem_server \ + liblog LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) @@ -17,4 +18,3 @@ LOCAL_MODULE:= system_server include $(BUILD_EXECUTABLE) include $(LOCAL_PATH)/library/Android.mk - diff --git a/cmds/system_server/library/Android.mk b/cmds/system_server/library/Android.mk index c42424c..d78474e 100644 --- a/cmds/system_server/library/Android.mk +++ b/cmds/system_server/library/Android.mk @@ -16,10 +16,11 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libsensorservice \ libsurfaceflinger \ - libinput \ + libinput \ libutils \ libbinder \ - libcutils + libcutils \ + liblog LOCAL_MODULE:= libsystem_server diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 66cea9d7..3e5586e 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -179,6 +179,7 @@ LOCAL_SHARED_LIBRARIES := \ libandroidfw \ libexpat \ libnativehelper \ + liblog \ libcutils \ libutils \ libbinder \ diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk index fff7eee..474b9b2 100644 --- a/drm/jni/Android.mk +++ b/drm/jni/Android.mk @@ -23,6 +23,7 @@ LOCAL_MODULE:= libdrmframework_jni LOCAL_SHARED_LIBRARIES := \ libdrmframework \ + liblog \ libutils \ libandroid_runtime \ libnativehelper \ @@ -43,4 +44,3 @@ LOCAL_C_INCLUDES += \ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) - diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk index 80d7728..e8beae5 100644 --- a/graphics/jni/Android.mk +++ b/graphics/jni/Android.mk @@ -10,6 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ libRS \ libcutils \ + liblog \ libskia \ libutils \ libui \ diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 06e658d..7b59bf2 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -58,7 +58,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DGL_GLEXT_PROTOTYPES 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_TAGS := optional diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 6873060..416a2a1 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libskia \ libui \ + liblog \ libcutils \ libgui \ libstagefright \ diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk index b5d8b7b..3b1fb19 100644 --- a/media/jni/audioeffect/Android.mk +++ b/media/jni/audioeffect/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ android_media_Visualizer.cpp LOCAL_SHARED_LIBRARIES := \ + liblog \ libcutils \ libutils \ libandroid_runtime \ diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index 040d2ab..6be7fdd 100644 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -52,6 +52,7 @@ LOCAL_SHARED_LIBRARIES := \ libaudioutils \ libbinder \ libcutils \ + liblog \ libdl \ libgui \ libmedia \ diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk index 9b11bfa..5835b9f 100644 --- a/media/jni/soundpool/Android.mk +++ b/media/jni/soundpool/Android.mk @@ -5,6 +5,7 @@ LOCAL_SRC_FILES:= \ android_media_SoundPool.cpp LOCAL_SHARED_LIBRARIES := \ + liblog \ libcutils \ libutils \ libandroid_runtime \ diff --git a/media/libdrm/mobile1/Android.mk b/media/libdrm/mobile1/Android.mk index b07d91c..7356f46 100644 --- a/media/libdrm/mobile1/Android.mk +++ b/media/libdrm/mobile1/Android.mk @@ -44,6 +44,7 @@ LOCAL_CFLAGS := $(LOCAL_DRM_CFLAG) LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ + liblog \ libcrypto LOCAL_MODULE := libdrm1 @@ -69,12 +70,13 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include/parser \ $(JNI_H_INCLUDE) \ $(call include-path-for, system-core)/cutils - + LOCAL_SHARED_LIBRARIES := libdrm1 \ libnativehelper \ libutils \ - libcutils + libcutils \ + liblog LOCAL_MODULE := libdrm1_jni diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk index 1d69799..2a9448d 100644 --- a/media/mca/filterfw/Android.mk +++ b/media/mca/filterfw/Android.mk @@ -37,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := libstlport \ libdl \ libcutils \ libutils \ + liblog \ libandroid \ libjnigraphics \ libmedia @@ -48,5 +49,3 @@ LOCAL_SHARED_LIBRARIES := libstlport \ LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) - - diff --git a/media/mca/filterpacks/Android.mk b/media/mca/filterpacks/Android.mk index 6166b1e..6e54f60 100644 --- a/media/mca/filterpacks/Android.mk +++ b/media/mca/filterpacks/Android.mk @@ -46,10 +46,8 @@ LOCAL_SRC_FILES += native/imageproc/brightness.c \ native/imageproc/invert.c \ native/imageproc/to_rgba.c -LOCAL_SHARED_LIBRARIES := libutils libfilterfw +LOCAL_SHARED_LIBRARIES := liblog libutils libfilterfw LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) - - diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk index 9dcc7ba..ad874c8 100644 --- a/media/tests/omxjpegdecoder/Android.mk +++ b/media/tests/omxjpegdecoder/Android.mk @@ -29,6 +29,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright_foundation \ libbinder \ libutils \ + liblog \ libjpeg LOCAL_C_INCLUDES := \ diff --git a/media/tests/players/Android.mk b/media/tests/players/Android.mk index c655ae6..adf0d30 100644 --- a/media/tests/players/Android.mk +++ b/media/tests/players/Android.mk @@ -20,7 +20,8 @@ LOCAL_SRC_FILES:= invoke_mock_media_player.cpp LOCAL_SHARED_LIBRARIES:= \ libbinder \ - libutils + libutils \ + liblog LOCAL_MODULE:= invoke_mock_media_player LOCAL_MODULE_TAGS := tests eng diff --git a/native/android/Android.mk b/native/android/Android.mk index 00d11da..207cc4b 100644 --- a/native/android/Android.mk +++ b/native/android/Android.mk @@ -17,6 +17,7 @@ LOCAL_SRC_FILES:= \ storage_manager.cpp LOCAL_SHARED_LIBRARIES := \ + liblog \ libcutils \ libandroidfw \ libutils \ diff --git a/packages/DefaultContainerService/jni/Android.mk b/packages/DefaultContainerService/jni/Android.mk index 79ff451..ef4f699 100644 --- a/packages/DefaultContainerService/jni/Android.mk +++ b/packages/DefaultContainerService/jni/Android.mk @@ -28,7 +28,8 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ - libutils + libutils \ + liblog LOCAL_STATIC_LIBRARIES := \ libdiskusage @@ -36,4 +37,4 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE := libdefcontainer_jni LOCAL_MODULE_TAGS := optional -include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file +include $(BUILD_SHARED_LIBRARY) diff --git a/services/common_time/Android.mk b/services/common_time/Android.mk index 0606ab4..75eb528 100644 --- a/services/common_time/Android.mk +++ b/services/common_time/Android.mk @@ -27,7 +27,8 @@ endif LOCAL_SHARED_LIBRARIES := \ libbinder \ libcommon_time_client \ - libutils + libutils \ + liblog LOCAL_MODULE_TAGS := optional LOCAL_MODULE := common_time diff --git a/services/input/Android.mk b/services/input/Android.mk index 159800f..5d913f3 100644 --- a/services/input/Android.mk +++ b/services/input/Android.mk @@ -29,6 +29,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ + liblog \ libandroidfw \ libutils \ libhardware \ diff --git a/services/input/tests/Android.mk b/services/input/tests/Android.mk index 8f8c34b..211e64b 100644 --- a/services/input/tests/Android.mk +++ b/services/input/tests/Android.mk @@ -9,6 +9,7 @@ test_src_files := \ shared_libraries := \ libcutils \ + liblog \ libandroidfw \ libutils \ libhardware \ diff --git a/services/jni/Android.mk b/services/jni/Android.mk index d097a93..b313d48 100644 --- a/services/jni/Android.mk +++ b/services/jni/Android.mk @@ -32,6 +32,7 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libandroidfw \ libcutils \ + liblog \ libhardware \ libhardware_legacy \ libnativehelper \ diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 5b88669..9b1658a 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -39,14 +39,14 @@ LOCAL_C_INCLUDES += external/libpng LOCAL_C_INCLUDES += external/zlib LOCAL_C_INCLUDES += build/libs/host/include -#LOCAL_WHOLE_STATIC_LIBRARIES := LOCAL_STATIC_LIBRARIES := \ libhost \ libandroidfw \ libutils \ libcutils \ libexpat \ - libpng + libpng \ + liblog ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt -ldl -lpthread diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk index dd57ae6..ad8de69 100644 --- a/tools/obbtool/Android.mk +++ b/tools/obbtool/Android.mk @@ -20,7 +20,8 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_STATIC_LIBRARIES := \ libutils \ libandroidfw \ - libcutils + libcutils \ + liblog ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -ldl -lpthread diff --git a/tools/validatekeymaps/Android.mk b/tools/validatekeymaps/Android.mk index fce2e93..90fbc08 100644 --- a/tools/validatekeymaps/Android.mk +++ b/tools/validatekeymaps/Android.mk @@ -20,7 +20,8 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_STATIC_LIBRARIES := \ libandroidfw \ libutils \ - libcutils + libcutils \ + liblog ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -ldl -lpthread |