diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-12-14 15:25:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-14 15:25:22 -0800 |
| commit | 442e29ef408f2cd32610988b52be6e06e11e4de2 (patch) | |
| tree | 80e3436ce9cc78cb62f2bb676e810f6133b19e0b /media/libstagefright | |
| parent | 34d2f10908526cf3011d6c167a5817522b5a24d7 (diff) | |
| parent | 0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4 (diff) | |
| download | frameworks_av-442e29ef408f2cd32610988b52be6e06e11e4de2.zip frameworks_av-442e29ef408f2cd32610988b52be6e06e11e4de2.tar.gz frameworks_av-442e29ef408f2cd32610988b52be6e06e11e4de2.tar.bz2 | |
am 0cd75629: Merge "Match new paths and organization in external/libvpx"
* commit '0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4':
Match new paths and organization in external/libvpx
Diffstat (limited to 'media/libstagefright')
| -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 |