content/content_tests.gypi - Issue 1805723002: Reland: H264 HW encode using VideoToolbox

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 1805723002: Reland: H264 HW encode using VideoToolbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix gyp. Created 4 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:

Index: content/content_tests.gypi

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

index b30f73c664aaf25a50abc4aeaa7e22903077c793..89e47ee51dd8e6d7bfb2037fbb78388dc42e32b1 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -1815,12 +1815,13 @@

}

]

}],

- ['chromeos==1', {

+ ['chromeos==1 or OS=="mac"', {

'targets': [

{

'target_name': 'video_encode_accelerator_unittest',

'type': 'executable',

'dependencies': [

+ 'content.gyp:content_common',

'../base/base.gyp:base',

'../media/media.gyp:media',

'../media/media.gyp:media_test_support',

@@ -1853,7 +1854,11 @@

}],

- },

+ }

+ ]

+ }],

+ ['chromeos==1', {

+ 'targets': [

{

'target_name': 'jpeg_decode_accelerator_unittest',

'type': 'executable',

« no previous file with comments | « content/content_common.gypi ('k') | media/base/mac/BUILD.gn » ('j') | no next file with comments »