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

Side by Side Diff: content/content_common.gypi

Issue 176883018: Remove additional protection of kDisableAcceleratedVideoDecode in bpf_gpu_policy_linux.cc. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 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/sandbox_linux/bpf_gpu_policy_linux.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 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 'include_dirs': [ 560 'include_dirs': [
561 '<(DEPTH)/third_party/khronos', 561 '<(DEPTH)/third_party/khronos',
562 ], 562 ],
563 'link_settings': { 563 'link_settings': {
564 'libraries': [ 564 'libraries': [
565 '-lEGL', 565 '-lEGL',
566 '-lGLESv2', 566 '-lGLESv2',
567 ], 567 ],
568 }, 568 },
569 }], 569 }],
570 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 570 ['(chromeos==1 or OS=="linux") and use_x11==1 and target_arch != "arm"', {
Ami GONE FROM CHROMIUM 2014/03/03 17:28:12 At least until https://codereview.chromium.org/179
571 'sources': [ 571 'sources': [
572 'common/gpu/media/h264_dpb.cc', 572 'common/gpu/media/h264_dpb.cc',
573 'common/gpu/media/h264_dpb.h', 573 'common/gpu/media/h264_dpb.h',
574 'common/gpu/media/va_surface.h', 574 'common/gpu/media/va_surface.h',
575 'common/gpu/media/vaapi_h264_decoder.cc', 575 'common/gpu/media/vaapi_h264_decoder.cc',
576 'common/gpu/media/vaapi_h264_decoder.h', 576 'common/gpu/media/vaapi_h264_decoder.h',
577 'common/gpu/media/vaapi_video_decode_accelerator.cc', 577 'common/gpu/media/vaapi_video_decode_accelerator.cc',
578 'common/gpu/media/vaapi_video_decode_accelerator.h', 578 'common/gpu/media/vaapi_video_decode_accelerator.h',
579 'common/gpu/media/vaapi_wrapper.cc', 579 'common/gpu/media/vaapi_wrapper.cc',
580 'common/gpu/media/vaapi_wrapper.h', 580 'common/gpu/media/vaapi_wrapper.h',
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 651 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
652 'common/sandbox_linux/bpf_renderer_policy_linux.h', 652 'common/sandbox_linux/bpf_renderer_policy_linux.h',
653 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 653 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
654 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 654 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
655 ], 655 ],
656 }, { 656 }, {
657 'defines': ['USE_SECCOMP_BPF'], 657 'defines': ['USE_SECCOMP_BPF'],
658 }], 658 }],
659 ], 659 ],
660 } 660 }
OLDNEW
« no previous file with comments | « content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698