Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_renderer.gypi

Issue 364003003: Fix default video decoder issue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unrelated change Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_video_decoder_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index ddc0bc376ac8914763135fc7378aa263a421564c..80aa4e340c3295d97189dde7bf0e6152c8c5c677 100644
--- a/content/content_renderer.gypi
+++ b/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',
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_video_decoder_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698