OSDN Git Service

Add liblog
authorYing Wang <wangying@google.com>
Wed, 10 Apr 2013 04:53:49 +0000 (21:53 -0700)
committerYing Wang <wangying@google.com>
Wed, 10 Apr 2013 04:53:49 +0000 (21:53 -0700)
Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0

48 files changed:
camera/Android.mk
cmds/stagefright/Android.mk
drm/drmserver/Android.mk
drm/libdrmframework/Android.mk
drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
drm/libdrmframework/plugins/passthru/Android.mk
drm/mediadrm/plugins/mock/Android.mk
libvideoeditor/lvpp/Android.mk
libvideoeditor/osal/src/Android.mk
libvideoeditor/vss/src/Android.mk
media/common_time/Android.mk
media/libeffects/downmix/Android.mk
media/libeffects/factory/Android.mk
media/libeffects/preprocessing/Android.mk
media/libeffects/visualizer/Android.mk
media/libmedia/Android.mk
media/libmediaplayerservice/Android.mk
media/libnbaio/Android.mk
media/libstagefright/chromium_http/Android.mk
media/libstagefright/codecs/aacdec/Android.mk
media/libstagefright/codecs/aacenc/Android.mk
media/libstagefright/codecs/amrnb/dec/Android.mk
media/libstagefright/codecs/amrnb/enc/Android.mk
media/libstagefright/codecs/amrwbenc/Android.mk
media/libstagefright/codecs/avc/enc/Android.mk
media/libstagefright/codecs/flac/enc/Android.mk
media/libstagefright/codecs/g711/dec/Android.mk
media/libstagefright/codecs/gsm/dec/Android.mk
media/libstagefright/codecs/m4v_h263/dec/Android.mk
media/libstagefright/codecs/m4v_h263/enc/Android.mk
media/libstagefright/codecs/mp3dec/Android.mk
media/libstagefright/codecs/on2/dec/Android.mk
media/libstagefright/codecs/on2/enc/Android.mk
media/libstagefright/codecs/on2/h264dec/Android.mk
media/libstagefright/codecs/raw/Android.mk
media/libstagefright/codecs/vorbis/dec/Android.mk
media/libstagefright/foundation/Android.mk
media/libstagefright/id3/Android.mk
media/libstagefright/omx/Android.mk
media/libstagefright/omx/tests/Android.mk
media/libstagefright/tests/Android.mk
media/libstagefright/wifi-display/Android.mk
media/libstagefright/yuv/Android.mk
media/mediaserver/Android.mk
media/mtp/Android.mk
services/audioflinger/Android.mk
services/camera/libcameraservice/Android.mk
services/medialog/Android.mk

index e33fb50..fa518ff 100644 (file)
@@ -22,6 +22,7 @@ LOCAL_SRC_FILES:= \
 LOCAL_SHARED_LIBRARIES := \
        libcutils \
        libutils \
+       liblog \
        libbinder \
        libhardware \
        libui \
index d583e65..3844487 100644 (file)
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES:=       \
 
 LOCAL_SHARED_LIBRARIES := \
        libstagefright libmedia libutils libbinder libstagefright_foundation \
-        libjpeg libgui libcutils
+        libjpeg libgui libcutils liblog
 
 LOCAL_C_INCLUDES:= \
        frameworks/av/media/libstagefright \
@@ -187,4 +187,3 @@ LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE:= muxer
 
 include $(BUILD_EXECUTABLE)
-
index 96205a1..dc973da 100644 (file)
@@ -24,6 +24,7 @@ LOCAL_SRC_FILES:= \
 LOCAL_SHARED_LIBRARIES := \
     libmedia \
     libutils \
+    liblog \
     libbinder \
     libdl
 
index 9e07fe3..49c4f9b 100644 (file)
@@ -25,6 +25,7 @@ LOCAL_MODULE:= libdrmframework
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
+    liblog \
     libbinder \
     libdl
 
index 205b9a5..e251f82 100644 (file)
@@ -36,6 +36,7 @@ LOCAL_SHARED_LIBRARIES := \
     libicui18n \
     libicuuc \
     libutils \
+    liblog \
     libdl \
     libcrypto \
     libssl \
index d170d49..cb3a2e2 100644 (file)
@@ -25,6 +25,7 @@ LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
+    liblog \
     libdl
 
 
index a056cd8..ada23a2 100644 (file)
@@ -24,7 +24,7 @@ LOCAL_MODULE := libmockdrmcryptoplugin
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm
 
 LOCAL_SHARED_LIBRARIES := \
-    libutils
+    libutils liblog
 
 LOCAL_C_INCLUDES += \
     $(TOP)/frameworks/av/include \
index 778c5ac..2286827 100755 (executable)
@@ -50,6 +50,7 @@ LOCAL_SHARED_LIBRARIES :=     \
     libaudioutils             \
     libbinder                 \
     libcutils                 \
+    liblog                    \
     libEGL                    \
     libGLESv2                 \
     libgui                    \
index b73b9ae..4f38b0c 100755 (executable)
@@ -41,7 +41,7 @@ LOCAL_SRC_FILES:=          \
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SHARED_LIBRARIES := libcutils libutils
+LOCAL_SHARED_LIBRARIES := libcutils libutils liblog
 
 LOCAL_C_INCLUDES += \
     $(TOP)/frameworks/av/libvideoeditor/osal/inc \
@@ -64,4 +64,3 @@ LOCAL_CFLAGS += -Wno-multichar \
     -DUSE_STAGEFRIGHT_3GPP_READER
 
 include $(BUILD_SHARED_LIBRARY)
-
index cda7a83..0caa15b 100755 (executable)
@@ -57,6 +57,7 @@ LOCAL_SHARED_LIBRARIES :=       \
     libaudioutils               \
     libbinder                   \
     libcutils                   \
+    liblog                      \
     libmedia                    \
     libstagefright              \
     libstagefright_foundation   \
@@ -96,4 +97,3 @@ LOCAL_CFLAGS += -Wno-multichar \
     -DDECODE_GIF_ON_SAVING
 
 include $(BUILD_SHARED_LIBRARY)
-
index 526f17b..632acbc 100644 (file)
@@ -16,6 +16,7 @@ LOCAL_SRC_FILES := cc_helper.cpp \
                    utils.cpp
 LOCAL_SHARED_LIBRARIES := libbinder \
                           libhardware \
-                          libutils
+                          libutils \
+                          liblog
 
 include $(BUILD_SHARED_LIBRARY)
index 3052ad9..5d0a87c 100644 (file)
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \
        EffectDownmix.c
 
 LOCAL_SHARED_LIBRARIES := \
-       libcutils
+       libcutils liblog
 
 LOCAL_MODULE:= libdownmix
 
index 6e69151..60a6ce5 100644 (file)
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \
        EffectsFactory.c
 
 LOCAL_SHARED_LIBRARIES := \
-       libcutils
+       libcutils liblog
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_MODULE:= libeffects
index dfa1711..c344352 100644 (file)
@@ -21,7 +21,8 @@ LOCAL_C_INCLUDES += $(call include-path-for, speex)
 LOCAL_SHARED_LIBRARIES := \
     libwebrtc_audio_preprocessing \
     libspeexresampler \
-    libutils
+    libutils \
+    liblog
 
 ifeq ($(TARGET_SIMULATOR),true)
 LOCAL_LDLIBS += -ldl
index 49cf4fa..e196eb2 100644 (file)
@@ -10,6 +10,7 @@ LOCAL_CFLAGS+= -O2 -fvisibility=hidden
 
 LOCAL_SHARED_LIBRARIES := \
        libcutils \
+       liblog \
        libdl
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
index fbe71ad..2c0c3a5 100644 (file)
@@ -63,7 +63,7 @@ LOCAL_SRC_FILES += SingleStateQueue.cpp
 LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"'
 
 LOCAL_SHARED_LIBRARIES := \
-       libui libcutils libutils libbinder libsonivox libicuuc libexpat \
+       libui liblog libcutils libutils libbinder libsonivox libicuuc libexpat \
         libcamera_client libstagefright_foundation \
         libgui libdl libaudioutils
 
index 2a6f3c7..d87bc7f 100644 (file)
@@ -27,6 +27,7 @@ LOCAL_SHARED_LIBRARIES :=       \
     libbinder                   \
     libcamera_client            \
     libcutils                   \
+    liblog                      \
     libdl                       \
     libgui                      \
     libmedia                    \
index d372d20..5d00d15 100644 (file)
@@ -30,6 +30,7 @@ LOCAL_SHARED_LIBRARIES := \
     libbinder \
     libcommon_time_client \
     libcutils \
-    libutils
+    libutils \
+    liblog
 
 include $(BUILD_SHARED_LIBRARY)
index 2c6d84c..f26f386 100644 (file)
@@ -22,6 +22,7 @@ LOCAL_SHARED_LIBRARIES += \
         libchromium_net \
         libutils \
         libcutils \
+        liblog \
         libstagefright_foundation \
         libstagefright \
         libdrmframework
index 4dc38a8..ffa64f9 100644 (file)
@@ -20,7 +20,7 @@ LOCAL_CFLAGS :=
 LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
 
 LOCAL_SHARED_LIBRARIES := \
-      libstagefright_omx libstagefright_foundation libutils libcutils
+      libstagefright_omx libstagefright_foundation libutils libcutils liblog
 
 LOCAL_MODULE := libstagefright_soft_aacdec
 LOCAL_MODULE_TAGS := optional
index 820734d..057c69b 100644 (file)
@@ -109,7 +109,7 @@ ifeq ($(AAC_LIBRARY), fraunhofer)
   LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
 
   LOCAL_SHARED_LIBRARIES := \
-          libstagefright_omx libstagefright_foundation libutils
+          libstagefright_omx libstagefright_foundation libutils liblog
 
   LOCAL_MODULE := libstagefright_soft_aacenc
   LOCAL_MODULE_TAGS := optional
@@ -132,7 +132,7 @@ else # visualon
           libstagefright_aacenc
 
   LOCAL_SHARED_LIBRARIES := \
-          libstagefright_omx libstagefright_foundation libutils \
+          libstagefright_omx libstagefright_foundation libutils liblog \
           libstagefright_enc_common
 
   LOCAL_MODULE := libstagefright_soft_aacenc
index b48a459..8d6c6f8 100644 (file)
@@ -72,7 +72,7 @@ LOCAL_STATIC_LIBRARIES := \
         libstagefright_amrnbdec libstagefright_amrwbdec
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright_omx libstagefright_foundation libutils \
+        libstagefright_omx libstagefright_foundation libutils liblog \
         libstagefright_amrnb_common
 
 LOCAL_MODULE := libstagefright_soft_amrdec
index 457656a..f4e467a 100644 (file)
@@ -92,7 +92,7 @@ LOCAL_STATIC_LIBRARIES := \
         libstagefright_amrnbenc
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright_omx libstagefright_foundation libutils \
+        libstagefright_omx libstagefright_foundation libutils liblog \
         libstagefright_amrnb_common
 
 LOCAL_MODULE := libstagefright_soft_amrnbenc
index edfd7b7..c5b8e0c 100644 (file)
@@ -130,7 +130,7 @@ LOCAL_STATIC_LIBRARIES := \
         libstagefright_amrwbenc
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright_omx libstagefright_foundation libutils \
+        libstagefright_omx libstagefright_foundation libutils liblog \
         libstagefright_enc_common
 
 LOCAL_MODULE := libstagefright_soft_amrwbenc
index cffe469..7d17c2a 100644 (file)
@@ -62,6 +62,7 @@ LOCAL_SHARED_LIBRARIES := \
         libstagefright_foundation \
         libstagefright_omx \
         libutils \
+        liblog \
         libui
 
 
index 546a357..f01d605 100644 (file)
@@ -10,7 +10,7 @@ LOCAL_C_INCLUDES := \
         external/flac/include
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright libstagefright_omx libstagefright_foundation libutils
+        libstagefright libstagefright_omx libstagefright_foundation libutils liblog
 
 LOCAL_STATIC_LIBRARIES := \
         libFLAC \
index 28be646..4c80da6 100644 (file)
@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \
         frameworks/native/include/media/openmax
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright libstagefright_omx libstagefright_foundation libutils
+        libstagefright libstagefright_omx libstagefright_foundation libutils liblog
 
 LOCAL_MODULE := libstagefright_soft_g711dec
 LOCAL_MODULE_TAGS := optional
index 9c0c6ae..71613d2 100644 (file)
@@ -10,7 +10,7 @@ LOCAL_C_INCLUDES := \
         external/libgsm/inc
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright libstagefright_omx libstagefright_foundation libutils
+        libstagefright libstagefright_omx libstagefright_foundation libutils liblog
 
 LOCAL_STATIC_LIBRARIES := \
         libgsm
index a6b1edc..a3d5779 100644 (file)
@@ -67,7 +67,7 @@ LOCAL_STATIC_LIBRARIES := \
         libstagefright_m4vh263dec
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright libstagefright_omx libstagefright_foundation libutils
+        libstagefright libstagefright_omx libstagefright_foundation libutils liblog
 
 LOCAL_MODULE := libstagefright_soft_mpeg4dec
 LOCAL_MODULE_TAGS := optional
index 865cc9c..83a2dd2 100644 (file)
@@ -65,6 +65,7 @@ LOCAL_SHARED_LIBRARIES := \
         libstagefright_foundation \
         libstagefright_omx \
         libutils \
+        liblog \
         libui
 
 
index ec8d7ec..135c715 100644 (file)
@@ -70,7 +70,7 @@ LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/include
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright libstagefright_omx libstagefright_foundation libutils
+        libstagefright libstagefright_omx libstagefright_foundation libutils liblog
 
 LOCAL_STATIC_LIBRARIES := \
         libstagefright_mp3dec
index 0082d7c..7f2c46d 100644 (file)
@@ -15,7 +15,7 @@ LOCAL_STATIC_LIBRARIES := \
         libvpx
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright libstagefright_omx libstagefright_foundation libutils
+        libstagefright libstagefright_omx libstagefright_foundation libutils liblog
 
 LOCAL_MODULE := libstagefright_soft_vpxdec
 LOCAL_MODULE_TAGS := optional
index 5d3317c..a92d376 100644 (file)
@@ -16,7 +16,7 @@ LOCAL_STATIC_LIBRARIES := \
         libvpx
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright libstagefright_omx libstagefright_foundation libutils \
+        libstagefright libstagefright_omx libstagefright_foundation libutils liblog \
 
 LOCAL_MODULE := libstagefright_soft_vpxenc
 LOCAL_MODULE_TAGS := optional
index 772fd60..2539f98 100644 (file)
@@ -97,7 +97,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true)
 endif
 
 LOCAL_SHARED_LIBRARIES := \
-       libstagefright libstagefright_omx libstagefright_foundation libutils \
+       libstagefright libstagefright_omx libstagefright_foundation libutils liblog \
 
 LOCAL_MODULE := libstagefright_soft_h264dec
 
@@ -124,4 +124,3 @@ LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := decoder
 
 include $(BUILD_EXECUTABLE)
-
index 285c747..fe90a03 100644 (file)
@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \
         frameworks/native/include/media/openmax
 
 LOCAL_SHARED_LIBRARIES := \
-        libstagefright_omx libstagefright_foundation libutils
+        libstagefright_omx libstagefright_foundation libutils liblog
 
 LOCAL_MODULE := libstagefright_soft_rawdec
 LOCAL_MODULE_TAGS := optional
index 395dd6b..2232353 100644 (file)
@@ -11,10 +11,9 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SHARED_LIBRARIES := \
         libvorbisidec libstagefright libstagefright_omx \
-        libstagefright_foundation libutils
+        libstagefright_foundation libutils liblog
 
 LOCAL_MODULE := libstagefright_soft_vorbisdec
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
-
index b7577d6..d65e213 100644 (file)
@@ -20,6 +20,7 @@ LOCAL_C_INCLUDES:= \
 LOCAL_SHARED_LIBRARIES := \
         libbinder         \
         libutils          \
+        liblog
 
 LOCAL_CFLAGS += -Wno-multichar
 
index ff35d4a..80a1a3a 100644 (file)
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := \
        testid3.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-       libstagefright libutils libbinder libstagefright_foundation
+       libstagefright libutils liblog libbinder libstagefright_foundation
 
 LOCAL_STATIC_LIBRARIES := \
         libstagefright_id3
index 9129f08..a8b4939 100644 (file)
@@ -19,6 +19,7 @@ LOCAL_SHARED_LIBRARIES :=               \
         libbinder                       \
         libmedia                        \
         libutils                        \
+        liblog                          \
         libui                           \
         libgui                          \
         libcutils                       \
index 04441ca..1061c39 100644 (file)
@@ -5,7 +5,7 @@ LOCAL_SRC_FILES =       \
        OMXHarness.cpp  \
 
 LOCAL_SHARED_LIBRARIES := \
-       libstagefright libbinder libmedia libutils libstagefright_foundation
+       libstagefright libbinder libmedia libutils liblog libstagefright_foundation
 
 LOCAL_C_INCLUDES := \
        $(TOP)/frameworks/av/media/libstagefright \
index 57fff0b..06ce16b 100644 (file)
@@ -26,6 +26,7 @@ LOCAL_SHARED_LIBRARIES := \
        libsync \
        libui \
        libutils \
+       liblog
 
 LOCAL_STATIC_LIBRARIES := \
        libgtest \
index 1578c21..f99ef60 100644 (file)
@@ -31,6 +31,7 @@ LOCAL_C_INCLUDES:= \
 LOCAL_SHARED_LIBRARIES:= \
         libbinder                       \
         libcutils                       \
+        liblog                          \
         libgui                          \
         libmedia                        \
         libstagefright                  \
@@ -59,6 +60,7 @@ LOCAL_SHARED_LIBRARIES:= \
         libstagefright_foundation       \
         libstagefright_wfd              \
         libutils                        \
+        liblog                          \
 
 LOCAL_MODULE:= wfd
 
@@ -81,6 +83,7 @@ LOCAL_SHARED_LIBRARIES:= \
         libstagefright_foundation       \
         libstagefright_wfd              \
         libutils                        \
+        liblog                          \
 
 LOCAL_MODULE:= udptest
 
@@ -103,6 +106,7 @@ LOCAL_SHARED_LIBRARIES:= \
         libstagefright_foundation       \
         libstagefright_wfd              \
         libutils                        \
+        liblog                          \
 
 LOCAL_MODULE:= rtptest
 
@@ -125,6 +129,7 @@ LOCAL_SHARED_LIBRARIES:= \
         libstagefright_foundation       \
         libstagefright_wfd              \
         libutils                        \
+        liblog                          \
 
 LOCAL_MODULE:= nettest
 
index a4253f6..b3f7b1b 100644 (file)
@@ -6,7 +6,8 @@ LOCAL_SRC_FILES:=               \
         YUVCanvas.cpp
 
 LOCAL_SHARED_LIBRARIES :=       \
-        libcutils
+        libcutils \
+        liblog
 
 LOCAL_MODULE:= libstagefright_yuv
 
index a485646..1ac647a 100644 (file)
@@ -22,6 +22,7 @@ LOCAL_SHARED_LIBRARIES := \
        libmedia \
        libmediaplayerservice \
        libutils \
+       liblog \
        libbinder
 
 LOCAL_STATIC_LIBRARIES := \
index bee28d4..ac608a1 100644 (file)
@@ -42,6 +42,6 @@ LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST
 # Needed for <bionic_time.h>
 LOCAL_C_INCLUDES := bionic/libc/private
 
-LOCAL_SHARED_LIBRARIES := libutils libcutils libusbhost libbinder
+LOCAL_SHARED_LIBRARIES := libutils libcutils liblog libusbhost libbinder
 
 include $(BUILD_SHARED_LIBRARY)
index 7806f48..061a079 100644 (file)
@@ -22,7 +22,7 @@ LOCAL_SRC_FILES:=               \
     AudioResampler.cpp.arm      \
     AudioPolicyService.cpp      \
     ServiceUtilities.cpp        \
-       AudioResamplerCubic.cpp.arm \
+    AudioResamplerCubic.cpp.arm \
     AudioResamplerSinc.cpp.arm
 
 LOCAL_SRC_FILES += StateQueue.cpp
@@ -39,6 +39,7 @@ LOCAL_SHARED_LIBRARIES := \
     libcommon_time_client \
     libcutils \
     libutils \
+    liblog \
     libbinder \
     libmedia \
     libnbaio \
@@ -94,9 +95,10 @@ LOCAL_SRC_FILES:=               \
     AudioResamplerSinc.cpp.arm
 
 LOCAL_SHARED_LIBRARIES := \
-       libdl \
+    libdl \
     libcutils \
-    libutils
+    libutils \
+    liblog
 
 LOCAL_MODULE:= test-resample
 
index 6847bf8..3c84703 100644 (file)
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES:=               \
 
 LOCAL_SHARED_LIBRARIES:= \
     libui \
+    liblog \
     libutils \
     libbinder \
     libcutils \
index 559b1ed..08006c8 100644 (file)
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := MediaLogService.cpp
 
-LOCAL_SHARED_LIBRARIES := libmedia libbinder libutils libnbaio
+LOCAL_SHARED_LIBRARIES := libmedia libbinder libutils liblog libnbaio
 
 LOCAL_MODULE:= libmedialogservice