Roll DEPS for libvpx and enable VP8/WebM for Chromium ARM builds.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47832 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -7,7 +7,7 @@ vars = {
   "chromium_git": "http://src.chromium.org/git",
   "swig_revision": "40423",
   "nacl_revision": "2235",
-  "libvpx_revision": "47701",
+  "libvpx_revision": "47824",
 }
 
 deps = {

third_party/ffmpeg/ffmpeg.gyp

@@ -328,10 +328,6 @@
                 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv6.S',
               ],
-              # TODO(scherkus): Temporary until libvpx compiles on ARM.
-              'sources!': [
-                'source/patched-ffmpeg-mt/libavcodec/libvpxdec.c',
-              ],
               'conditions': [
                 ['arm_neon==1', {
                   'sources': [
@@ -386,18 +382,13 @@
                 'ldflags': [
                   '-Wl,-Bsymbolic',
                   '-L<(shared_generated_dir)',
-                  '-L<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)',
+                  '-L<(libvpx_hack_dir)/lib/<(OS)/<(ffmpeg_config)',
                 ],
                 'libraries': [
+                  '-lvpx',
                   '-lz',
                 ],
                 'conditions': [
-                  ['target_arch!="arm"', {
-                    'libraries': [
-                      # TODO(scherkus): Temporary until libvpx compiles on ARM.
-                      '-lvpx',
-                    ],
-                  }],
                   ['ffmpeg_asm_lib==1', {
                     'libraries': [
                       # TODO(ajwong): When scons is dead, collapse this with the
@@ -415,7 +406,7 @@
                 #
                 # http://code.google.com/p/gyp/issues/detail?id=108
                 '<(shared_generated_dir)/<(STATIC_LIB_PREFIX)<(asm_library)<(STATIC_LIB_SUFFIX)',
-                '<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)/libvpx.a',
+                '<(libvpx_hack_dir)/lib/<(OS)/<(ffmpeg_config)/libvpx.a',
               ],
               'link_settings': {
                 'libraries': [