content/content_tests.gypi - Issue 356903002: Revert "Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate...""

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_tests.gypi

Issue 356903002: Revert "Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate..."" (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 side-by-side diff with in-line comments

Download patch

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index 66f6dda607db97bdba551fa5d7d120e830befa52..01af31685b1edd27768c79420d9217b2d55c1b57 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -1467,7 +1467,7 @@

]

}],

- ['chromeos==1 and target_arch == "arm"', {

+ ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', {

'targets': [

{

'target_name': 'video_encode_accelerator_unittest',

@@ -1487,6 +1487,17 @@

'common/gpu/media/video_accelerator_unittest_helpers.h',

'common/gpu/media/video_encode_accelerator_unittest.cc',

+ 'include_dirs': [

+ '<(DEPTH)/third_party/libva',

+ '<(DEPTH)/third_party/libyuv',

+ ],

+ 'conditions': [

+ ['use_x11==1', {

+ 'dependencies': [

+ '../ui/gfx/x/gfx_x11.gyp:gfx_x11',

+ ],

+ }],

+ ],

]

}],

« no previous file with comments | « content/content_common.gypi ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »