content/content_tests.gypi - Issue 10736006: Fix OMX VDA unittest for ARM.

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 10736006: Fix OMX VDA unittest for ARM. (Closed) Base URL: https://git.chromium.org/git/chromium/src@master

Patch Set: Created 8 years, 5 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 eeb3805b800b6c8896708858ac901e8b57c5c3be..54964247b0fecb8d4047cec27a64960a50f636cc 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -589,7 +589,6 @@

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

'../testing/gtest.gyp:gtest',

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

- '../ui/gl/gl.gyp:gl',

'../ui/ui.gyp:ui',

'include_dirs': [

@@ -626,6 +625,11 @@

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

}],

+ ['target_arch != "arm"', {

+ 'dependencies': [

+ '../ui/gl/gl.gyp:gl',

+ ],

+ }],

['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {

'include_dirs': [

'<(DEPTH)/third_party/libva',

« no previous file with comments | « content/common/gpu/media/rendering_helper_gl.cc ('k') | no next file » | no next file with comments »