content/common/BUILD.gn - Issue 832383004: Revert of Support multiple video decoders and encoders

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/common/BUILD.gn

Issue 832383004: Revert of Support multiple video decoders and encoders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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/common/BUILD.gn

diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn

index 69eb4709a359712e8aedefbcdb34c4cfeb8f1db6..8cec06a92fa544b10714aa124caea78d4dead017 100644

--- a/content/common/BUILD.gn

+++ b/content/common/BUILD.gn

@@ -278,10 +278,12 @@

}

if (is_chromeos) {

- if (cpu_arch == "arm" || use_ozone) {

+ if (cpu_arch == "arm" && use_x11) {

sources += [

- "gpu/media/generic_v4l2_video_device.cc",

- "gpu/media/generic_v4l2_video_device.h",

+ "gpu/media/exynos_v4l2_video_device.cc",

+ "gpu/media/exynos_v4l2_video_device.h",

+ "gpu/media/tegra_v4l2_video_device.cc",

+ "gpu/media/tegra_v4l2_video_device.h",

"gpu/media/v4l2_image_processor.cc",

"gpu/media/v4l2_image_processor.h",

"gpu/media/v4l2_video_decode_accelerator.cc",

@@ -295,12 +297,6 @@

"EGL",

"GLESv2",

]

- if (cpu_arch == "arm") {

- sources += [

- "gpu/media/tegra_v4l2_video_device.cc",

- "gpu/media/tegra_v4l2_video_device.h",

- ]

- }

}

if (cpu_arch != "arm") {

sources += [

« no previous file with comments | « no previous file | content/common/gpu/media/gpu_video_decode_accelerator.h » ('j') | no next file with comments »