diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-12-14 12:48:41 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-14 12:48:42 -0800 |
| commit | 65e8ca7abe6b5a69a61112fc694c6babdc52220f (patch) | |
| tree | b0d52a753de6c7f7dd985f6aab493fa1af3c1ab3 /media | |
| parent | 16ffd2e30bedbec15b9015f1935b9761279a98be (diff) | |
| parent | e81a9610343425e5bb76cdb297065426c6e75ef0 (diff) | |
| download | frameworks_av-65e8ca7abe6b5a69a61112fc694c6babdc52220f.zip frameworks_av-65e8ca7abe6b5a69a61112fc694c6babdc52220f.tar.gz frameworks_av-65e8ca7abe6b5a69a61112fc694c6babdc52220f.tar.bz2 | |
Merge "Match new paths and organization in external/libvpx"
Diffstat (limited to 'media')
| -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 faa0f31..cc0581e 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -95,6 +95,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 |