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

Side by Side Diff: content/content_common.gypi

Issue 312803002: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address danakj@'s concern 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
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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 'include_dirs': [ 668 'include_dirs': [
669 '<(DEPTH)/third_party/khronos', 669 '<(DEPTH)/third_party/khronos',
670 ], 670 ],
671 'link_settings': { 671 'link_settings': {
672 'libraries': [ 672 'libraries': [
673 '-lEGL', 673 '-lEGL',
674 '-lGLESv2', 674 '-lGLESv2',
675 ], 675 ],
676 }, 676 },
677 }], 677 }],
678 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 678 ['(chromeos==1 or OS=="linux") and use_x11==1 and target_arch != "arm"', {
danakj 2014/06/19 15:56:26 and here?
679 'sources': [ 679 'sources': [
680 'common/gpu/media/h264_dpb.cc', 680 'common/gpu/media/h264_dpb.cc',
681 'common/gpu/media/h264_dpb.h', 681 'common/gpu/media/h264_dpb.h',
682 'common/gpu/media/va_surface.h', 682 'common/gpu/media/va_surface.h',
683 'common/gpu/media/vaapi_h264_decoder.cc', 683 'common/gpu/media/vaapi_h264_decoder.cc',
684 'common/gpu/media/vaapi_h264_decoder.h', 684 'common/gpu/media/vaapi_h264_decoder.h',
685 'common/gpu/media/vaapi_video_decode_accelerator.cc', 685 'common/gpu/media/vaapi_video_decode_accelerator.cc',
686 'common/gpu/media/vaapi_video_decode_accelerator.h', 686 'common/gpu/media/vaapi_video_decode_accelerator.h',
687 'common/gpu/media/vaapi_wrapper.cc', 687 'common/gpu/media/vaapi_wrapper.cc',
688 'common/gpu/media/vaapi_wrapper.h', 688 'common/gpu/media/vaapi_wrapper.h',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 798 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
799 'common/sandbox_linux/bpf_renderer_policy_linux.h', 799 'common/sandbox_linux/bpf_renderer_policy_linux.h',
800 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 800 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
801 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 801 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
802 ], 802 ],
803 }, { 803 }, {
804 'defines': ['USE_SECCOMP_BPF'], 804 'defines': ['USE_SECCOMP_BPF'],
805 }], 805 }],
806 ], 806 ],
807 } 807 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698