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 | 0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4 (patch) | |
tree | 732236d77f58318fd018af3eb0b53e41ad514abc | |
parent | 409542cdaf72d8983043f2746d9d916ee1566a80 (diff) | |
parent | a20fc62f23263c4220c1a14eb6a37165f7cdf327 (diff) |
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 faa0f315..cc0581e9 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 32238718..0082d7ce 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 2cccb4f9..2d8c1e16 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 |