diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:57:49 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:57:49 +0000 |
| commit | 5cd02a973830086a36ec7ef766bab1c84042a645 (patch) | |
| tree | 7b434e9e3f7ba33226223af8703cd77352c9a534 /content/content_common.gypi | |
| parent | 11f764bbe5614c7973203308235d907fd275f1f6 (diff) | |
| download | chromium_src-5cd02a973830086a36ec7ef766bab1c84042a645.zip chromium_src-5cd02a973830086a36ec7ef766bab1c84042a645.tar.gz chromium_src-5cd02a973830086a36ec7ef766bab1c84042a645.tar.bz2 | |
Updated OMX decoder for recent PPAPI changes, and added to the build.
Had to move from content/gpu to content/common/gpu to allow gpu_video_service.cc
to depend on the decoder.
Removed some dead code and did some random cleanup while I was in there.
BUG=none
TEST=chrome compiles on cros/arm!
Review URL: http://codereview.chromium.org/7057027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
| -rw-r--r-- | content/content_common.gypi | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index 24d9bee..27d0aa8 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -289,6 +289,23 @@ '../gpu/gpu.gyp:command_buffer_service', ], }], + ['target_arch=="arm"', { + 'sources': [ + 'common/gpu/gles2_texture_to_egl_image_translator.cc', + 'common/gpu/gles2_texture_to_egl_image_translator.h', + 'common/gpu/omx_video_decode_accelerator.cc', + 'common/gpu/omx_video_decode_accelerator.h', + ], + 'include_dirs': [ + '<(DEPTH)/third_party/openmax/il', + ], + 'link_settings': { + 'libraries': [ + '-lEGL', + '-lGLESv2', + ], + }, + }], ], }, ], |