media/base/BUILD.gn - Issue 914363002: Add the "is_ensemble" build variable.

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: media/base/BUILD.gn

Issue 914363002: Add the "is_ensemble" build variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Do not change media.gyp. Created 5 years, 10 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: media/base/BUILD.gn

diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn

index fd1bfe0263cfc94e608cf2ae831bb415fecf1c99..dc8147a43ce65f9773243cc62d6d68ec79990b0d 100644

--- a/media/base/BUILD.gn

+++ b/media/base/BUILD.gn

@@ -182,12 +182,14 @@ source_set("base") {

"yuv_convert.h",

]

defines = []

- deps = [

- "//skia",

- ]

+ deps = []

libs = []

configs += [ "//media:media_config" ]

+ if (!is_ensemble) {

+ deps += [ "//skia" ]

+ }

if (media_use_ffmpeg) {

sources += [

"audio_video_metadata_extractor.cc",

@@ -217,7 +219,7 @@ source_set("base") {

sources += [ "media_posix.cc" ]

}

- if (is_linux && use_x11) {

+ if (is_linux && use_x11 && !is_ensemble) {

configs += [

"//build/config/linux:x11",

"//build/config/linux:xext",

« no previous file with comments | « media/BUILD.gn ('k') | media/media_options.gni » ('j') | no next file with comments »