| commit | e81a9610343425e5bb76cdb297065426c6e75ef0 | [log] [tgz] |
|---|---|---|
| author | Johann <johannkoenig@google.com> | Mon Oct 29 16:48:23 2012 -0700 |
| committer | Johann <johannkoenig@google.com> | Wed Dec 12 16:07:07 2012 -0800 |
| tree | cb79f369b569f24f14fd822c393f5650de146278 | |
| parent | f4283b689abeac92399a26813ca12234050dcb2f [diff] |
Match new paths and organization in external/libvpx See I2c0a87b0fc049e855e21f455b806287b578091de Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
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 @@ 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 @@ 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_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 @@ MatroskaExtractor.cpp LOCAL_C_INCLUDES:= \ - $(TOP)/external/libvpx/mkvparser \ + $(TOP)/external/libvpx/libwebm \ $(TOP)/frameworks/native/include/media/openmax \ LOCAL_CFLAGS += -Wno-multichar