diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 14:47:32 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 14:47:32 +0000 |
| commit | 11e24d4b0c46333a9ec7ab2beb280d9dae8781bd (patch) | |
| tree | 085a0e5ee96a8673e6b6491675502f87d338babc | |
| parent | 7c3b4214a3f59a298bf2c341557ced4fb6d212e3 (diff) | |
| download | chromium_src-11e24d4b0c46333a9ec7ab2beb280d9dae8781bd.zip chromium_src-11e24d4b0c46333a9ec7ab2beb280d9dae8781bd.tar.gz chromium_src-11e24d4b0c46333a9ec7ab2beb280d9dae8781bd.tar.bz2 | |
Roll in ffmpeg, libvpx and gyp to build libvpx on ARM
Roll new ffmpeg, libvpx and gyp. Also modify remoting.gyp so
that everything should builds.
BUG=70688, 47285
TBR=scherkus
TEST=All buildbots are green
Review URL: http://codereview.chromium.org/7621013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96389 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 6 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 16 |
2 files changed, 9 insertions, 13 deletions
@@ -19,8 +19,8 @@ vars = { "nacl_chrome_ppapi_revision": "93797", # native_client/DEPS: chrome_ppapi_rev "nacl_tools_revision": "5360", # native_client/DEPS: tools_rev "libjingle_revision": "77", - "libvpx_revision": "90416", - "ffmpeg_revision": "96257", + "libvpx_revision": "96377", + "ffmpeg_revision": "96373", "sfntly_revision": "43", "skia_revision": "2096", "v8_revision": "8902", @@ -86,7 +86,7 @@ deps = { (Var("googlecode_url") % "snappy") + "/trunk@37", "src/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@989", + (Var("googlecode_url") % "gyp") + "/trunk@990", "src/v8": (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 325313b..5391895 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -165,6 +165,7 @@ 'remoting_base', 'remoting_host', 'remoting_jingle_glue', + '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ @@ -213,15 +214,6 @@ 'host/plugin/host_plugin.rc', ], }], - ['target_arch=="arm"', { - 'dependencies': [ - '../third_party/libvpx/libvpx.gyp:libvpx_lib', - ], - }, { - 'dependencies': [ - '../third_party/libvpx/libvpx.gyp:libvpx', - ], - }], ], }, # end of target 'remoting_host_plugin' { @@ -283,7 +275,6 @@ '../ui/ui.gyp:ui', '../net/net.gyp:net', '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../third_party/libvpx/libvpx.gyp:libvpx_include', '../third_party/zlib/zlib.gyp:zlib', '../media/media.gyp:yuv_convert', 'remoting_jingle_glue', @@ -298,6 +289,11 @@ '../third_party/protobuf/protobuf.gyp:protobuf_lite', 'proto/chromotocol.gyp:chromotocol_proto_lib', ], + # TODO(hclam): Remove this and depend on libvpx directly once we remove + # libvpx from FFmpeg. + 'include_dirs': [ + '../third_party/libvpx/source/libvpx', + ], # This target needs a hard dependency because dependent targets # depend on chromotocol_proto_lib for headers. 'hard_dependency': 1, |