Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Unified Diff: media/base/BUILD.gn

Issue 1098503002: Remove the is_ensemble build variable from the GN files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « media/BUILD.gn ('k') | media/media_options.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/BUILD.gn
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index 64c5b135ab4674a8e2dd4b67b0c7db039670801f..5a6f9411ea5d4f37ab459b43cc04081d30f920fe 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -187,14 +187,12 @@ source_set("base") {
"yuv_convert.h",
]
defines = []
- deps = []
+ deps = [
+ "//skia",
+ ]
libs = []
configs += [ "//media:media_config" ]
- if (!is_ensemble) {
- deps += [ "//skia" ]
- }
-
if (media_use_ffmpeg) {
sources += [
"audio_video_metadata_extractor.cc",
@@ -224,7 +222,7 @@ source_set("base") {
sources += [ "media_posix.cc" ]
}
- if (is_linux && use_x11 && !is_ensemble) {
+ if (is_linux && use_x11) {
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 »

Powered by Google App Engine
This is Rietveld 408576698