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

Side by Side Diff: content/content_common.gypi

Issue 6979017: Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/gpu/omx_video_decode_accelerator.cc ('k') | content/gpu/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'content_common', 8 'target_name': 'content_common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 ['toolkit_views==1', { 282 ['toolkit_views==1', {
283 'sources': [ 283 'sources': [
284 'common/native_web_keyboard_event_views.cc', 284 'common/native_web_keyboard_event_views.cc',
285 ], 285 ],
286 }], 286 }],
287 ['enable_gpu==1', { 287 ['enable_gpu==1', {
288 'dependencies': [ 288 'dependencies': [
289 '../gpu/gpu.gyp:command_buffer_service', 289 '../gpu/gpu.gyp:command_buffer_service',
290 ], 290 ],
291 }], 291 }],
292 ['target_arch=="arm"', {
293 'sources': [
294 'common/gpu/gles2_texture_to_egl_image_translator.cc',
295 'common/gpu/gles2_texture_to_egl_image_translator.h',
296 'common/gpu/omx_video_decode_accelerator.cc',
297 'common/gpu/omx_video_decode_accelerator.h',
298 ],
299 'include_dirs': [
300 '<(DEPTH)/third_party/openmax/il',
301 ],
302 'link_settings': {
303 'libraries': [
304 '-lEGL',
305 '-lGLESv2',
306 ],
307 },
308 }],
309 ], 292 ],
310 }, 293 },
311 ], 294 ],
312 } 295 }
OLDNEW
« no previous file with comments | « content/common/gpu/omx_video_decode_accelerator.cc ('k') | content/gpu/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698