Fix default video decoder issue

On Android there is no software fallback for the video decoder.  Disable the
fallback path and remove the dependencies.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032
R=bbudge@chromium.org

Review URL: https://codereview.chromium.org/364003003

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

content/content_renderer.gypi

@@ -840,6 +840,15 @@
       'sources': [
         '<@(private_renderer_plugin_sources)',
       ],
+      'conditions': [
+        ['OS=="android"', {
+          'sources!': [
+            # Android does not build FFmpeg, which these depend on.
+            'renderer/pepper/video_decoder_shim.cc',
+            'renderer/pepper/video_decoder_shim.h',
+          ],
+        }],
+      ],
       'dependencies': [
         '../ppapi/ppapi_internal.gyp:ppapi_host',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',

content/renderer/pepper/pepper_video_decoder_host.cc

@@ -139,6 +139,9 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize(
   }
   decoder_.reset();
 
+#if defined(OS_ANDROID)
+  return PP_ERROR_NOTSUPPORTED;
+#else
   if (!allow_software_fallback)
     return PP_ERROR_NOTSUPPORTED;
 
@@ -147,6 +150,7 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize(
   decoder_->Initialize(media_profile, this);
 
   return PP_OK_COMPLETIONPENDING;
+#endif
 }
 
 int32_t PepperVideoDecoderHost::OnHostMsgGetShm(