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

Side by Side Diff: content/content_common.gypi

Issue 335393005: Do not directly link to EGL/GLESv2 for arm x11 chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « no previous file | no next file » | 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 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 'common/gpu/media/v4l2_video_decode_accelerator.cc', 658 'common/gpu/media/v4l2_video_decode_accelerator.cc',
659 'common/gpu/media/v4l2_video_decode_accelerator.h', 659 'common/gpu/media/v4l2_video_decode_accelerator.h',
660 'common/gpu/media/v4l2_video_device.cc', 660 'common/gpu/media/v4l2_video_device.cc',
661 'common/gpu/media/v4l2_video_device.h', 661 'common/gpu/media/v4l2_video_device.h',
662 'common/gpu/media/v4l2_video_encode_accelerator.cc', 662 'common/gpu/media/v4l2_video_encode_accelerator.cc',
663 'common/gpu/media/v4l2_video_encode_accelerator.h', 663 'common/gpu/media/v4l2_video_encode_accelerator.h',
664 ], 664 ],
665 'include_dirs': [ 665 'include_dirs': [
666 '<(DEPTH)/third_party/khronos', 666 '<(DEPTH)/third_party/khronos',
667 ], 667 ],
668 'link_settings': {
669 'libraries': [
670 '-lEGL',
671 '-lGLESv2',
672 ],
673 },
674 }], 668 }],
675 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 669 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
676 'sources': [ 670 'sources': [
677 'common/gpu/media/h264_dpb.cc', 671 'common/gpu/media/h264_dpb.cc',
678 'common/gpu/media/h264_dpb.h', 672 'common/gpu/media/h264_dpb.h',
679 'common/gpu/media/va_surface.h', 673 'common/gpu/media/va_surface.h',
680 'common/gpu/media/vaapi_h264_decoder.cc', 674 'common/gpu/media/vaapi_h264_decoder.cc',
681 'common/gpu/media/vaapi_h264_decoder.h', 675 'common/gpu/media/vaapi_h264_decoder.h',
682 'common/gpu/media/vaapi_video_decode_accelerator.cc', 676 'common/gpu/media/vaapi_video_decode_accelerator.cc',
683 'common/gpu/media/vaapi_video_decode_accelerator.h', 677 'common/gpu/media/vaapi_video_decode_accelerator.h',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 789 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
796 'common/sandbox_linux/bpf_renderer_policy_linux.h', 790 'common/sandbox_linux/bpf_renderer_policy_linux.h',
797 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 791 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
798 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 792 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
799 ], 793 ],
800 }, { 794 }, {
801 'defines': ['USE_SECCOMP_BPF'], 795 'defines': ['USE_SECCOMP_BPF'],
802 }], 796 }],
803 ], 797 ],
804 } 798 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698