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

Side by Side Diff: content/content_common.gypi

Issue 11973010: AndroidVDA by using Android's MediaCodec API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply xhwang's comment. Created 7 years, 9 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
« no previous file with comments | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | content/content_tests.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../components/components_tracing.gyp:tracing', 9 '../components/components_tracing.gyp:tracing',
10 '../media/media.gyp:media', 10 '../media/media.gyp:media',
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 'sources!': [ 480 'sources!': [
481 'common/pepper_plugin_registry.cc', 481 'common/pepper_plugin_registry.cc',
482 'common/pepper_plugin_registry.h', 482 'common/pepper_plugin_registry.h',
483 ], 483 ],
484 }], 484 }],
485 ['enable_gpu==1', { 485 ['enable_gpu==1', {
486 'dependencies': [ 486 'dependencies': [
487 '../gpu/gpu.gyp:command_buffer_service', 487 '../gpu/gpu.gyp:command_buffer_service',
488 ], 488 ],
489 }], 489 }],
490 ['OS=="android"', {
491 'dependencies': [
492 '../media/media.gyp:media',
493 ],
494 'sources': [
495 'common/gpu/media/android_video_decode_accelerator.cc',
496 'common/gpu/media/android_video_decode_accelerator.h',
497 ],
498 'link_settings': {
499 'libraries': [
500 '-lEGL',
501 '-lGLESv2',
piman 2013/02/28 22:02:56 This is rather unusual, we shouldn't be linking di
dwkang1 2013/02/28 22:36:28 Removed.
dwkang1 2013/02/28 22:55:42 Oh, I misunderstood your comment. ui/gl/gl.gyp:gl
502 ],
503 },
504 }],
490 ['target_arch=="arm" and chromeos == 1', { 505 ['target_arch=="arm" and chromeos == 1', {
491 'dependencies': [ 506 'dependencies': [
492 '../media/media.gyp:media', 507 '../media/media.gyp:media',
493 ], 508 ],
494 'sources': [ 509 'sources': [
495 'common/gpu/media/exynos_video_decode_accelerator.cc', 510 'common/gpu/media/exynos_video_decode_accelerator.cc',
496 'common/gpu/media/exynos_video_decode_accelerator.h', 511 'common/gpu/media/exynos_video_decode_accelerator.h',
497 'common/gpu/media/gles2_texture_to_egl_image_translator.cc', 512 'common/gpu/media/gles2_texture_to_egl_image_translator.cc',
498 'common/gpu/media/gles2_texture_to_egl_image_translator.h', 513 'common/gpu/media/gles2_texture_to_egl_image_translator.h',
499 'common/gpu/media/omx_video_decode_accelerator.cc', 514 'common/gpu/media/omx_video_decode_accelerator.cc',
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 591 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
577 '<(output)', 592 '<(output)',
578 '<(PRODUCT_DIR)', 593 '<(PRODUCT_DIR)',
579 ], 594 ],
580 'msvs_cygwin_shell': 1, 595 'msvs_cygwin_shell': 1,
581 }, 596 },
582 ] 597 ]
583 }], 598 }],
584 ], 599 ],
585 } 600 }
OLDNEW
« no previous file with comments | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698