diff options
| author | Ying Wang <wangying@google.com> | 2012-12-12 14:57:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-12 14:57:16 -0800 |
| commit | 8cade496e47fc7d8f01e286579a5db15b85c59cc (patch) | |
| tree | b5ab1e2a8101fdc324aa711af4a948e4fe95f541 | |
| parent | 4fa89b9b52e3329bb846ef314fb0ac65c0c1e04f (diff) | |
| parent | fd88f86ec6788170fb4d903c1b0932a18ce1197c (diff) | |
| download | frameworks_av-8cade496e47fc7d8f01e286579a5db15b85c59cc.zip frameworks_av-8cade496e47fc7d8f01e286579a5db15b85c59cc.tar.gz frameworks_av-8cade496e47fc7d8f01e286579a5db15b85c59cc.tar.bz2 | |
Merge "Match new paths and organization in external/libvpx"
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/codecs/on2/dec/Android.mk | 7 | ||||
| -rw-r--r-- | media/libstagefright/matroska/Android.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index a056706..85662db 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -94,6 +94,7 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_matroska \ libstagefright_timedtext \ libvpx \ + libwebm \ libstagefright_mpeg2ts \ libstagefright_httplive \ libstagefright_id3 \ diff --git a/media/libstagefright/codecs/on2/dec/Android.mk b/media/libstagefright/codecs/on2/dec/Android.mk index 3223871..0082d7c 100644 --- a/media/libstagefright/codecs/on2/dec/Android.mk +++ b/media/libstagefright/codecs/on2/dec/Android.mk @@ -5,9 +5,9 @@ LOCAL_SRC_FILES := \ SoftVPX.cpp LOCAL_C_INCLUDES := \ - $(TOP)/external/libvpx \ - $(TOP)/external/libvpx/vpx_codec \ - $(TOP)/external/libvpx/vpx_ports \ + $(TOP)/external/libvpx/libvpx \ + $(TOP)/external/libvpx/libvpx/vpx_codec \ + $(TOP)/external/libvpx/libvpx/vpx_ports \ frameworks/av/media/libstagefright/include \ frameworks/native/include/media/openmax \ @@ -21,4 +21,3 @@ LOCAL_MODULE := libstagefright_soft_vpxdec LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) - diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk index 2cccb4f..2d8c1e1 100644 --- a/media/libstagefright/matroska/Android.mk +++ b/media/libstagefright/matroska/Android.mk @@ -5,7 +5,7 @@ LOCAL_SRC_FILES:= \ MatroskaExtractor.cpp LOCAL_C_INCLUDES:= \ - $(TOP)/external/libvpx/mkvparser \ + $(TOP)/external/libvpx/libwebm \ $(TOP)/frameworks/native/include/media/openmax \ LOCAL_CFLAGS += -Wno-multichar |