diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:25:03 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:25:03 +0000 |
| commit | ee2a19b11962637b36171fef40eb85ab93958036 (patch) | |
| tree | d934cc904a4515b9358efff92eae33bd0b29cef1 /content/content_common.gypi | |
| parent | 76420799ecf0dae804bd267d8336e96c031752ce (diff) | |
| download | chromium_src-ee2a19b11962637b36171fef40eb85ab93958036.zip chromium_src-ee2a19b11962637b36171fef40eb85ab93958036.tar.gz chromium_src-ee2a19b11962637b36171fef40eb85ab93958036.tar.bz2 | |
Revert 86681 - 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
TBR=fischman@chromium.org
Review URL: http://codereview.chromium.org/6979017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
| -rw-r--r-- | content/content_common.gypi | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index 27d0aa8..24d9bee 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -289,23 +289,6 @@ '../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', - ], - }, - }], ], }, ], |