summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/on2
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-04-09 22:25:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-09 22:25:13 -0700
commit844ebdef8c73b98ec29c75f1fd7940624e70d14d (patch)
tree0ae3d9ebfea83148018ebf4825ad9c902e8d8e83 /media/libstagefright/codecs/on2
parenta4d0cd1b817a3c55858af5f754f7daa302de087e (diff)
parente63f850b179a43a344d438f202ad34ec7566f955 (diff)
downloadframeworks_av-844ebdef8c73b98ec29c75f1fd7940624e70d14d.zip
frameworks_av-844ebdef8c73b98ec29c75f1fd7940624e70d14d.tar.gz
frameworks_av-844ebdef8c73b98ec29c75f1fd7940624e70d14d.tar.bz2
am e63f850b: am da0dc0af: Add liblog
* commit 'e63f850b179a43a344d438f202ad34ec7566f955': Add liblog
Diffstat (limited to 'media/libstagefright/codecs/on2')
-rw-r--r--media/libstagefright/codecs/on2/dec/Android.mk2
-rw-r--r--media/libstagefright/codecs/on2/enc/Android.mk2
-rw-r--r--media/libstagefright/codecs/on2/h264dec/Android.mk3
3 files changed, 3 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/on2/dec/Android.mk b/media/libstagefright/codecs/on2/dec/Android.mk
index 0082d7c..7f2c46d 100644
--- a/media/libstagefright/codecs/on2/dec/Android.mk
+++ b/media/libstagefright/codecs/on2/dec/Android.mk
@@ -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
diff --git a/media/libstagefright/codecs/on2/enc/Android.mk b/media/libstagefright/codecs/on2/enc/Android.mk
index 5d3317c..a92d376 100644
--- a/media/libstagefright/codecs/on2/enc/Android.mk
+++ b/media/libstagefright/codecs/on2/enc/Android.mk
@@ -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
diff --git a/media/libstagefright/codecs/on2/h264dec/Android.mk b/media/libstagefright/codecs/on2/h264dec/Android.mk
index 0a273e2..655b2ab 100644
--- a/media/libstagefright/codecs/on2/h264dec/Android.mk
+++ b/media/libstagefright/codecs/on2/h264dec/Android.mk
@@ -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 := optional
LOCAL_MODULE := decoder
include $(BUILD_EXECUTABLE)
-