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

Side by Side 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: Gate on !is_ensemble instead. Add GYP changes. 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:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/config/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//media/media_options.gni") 9 import("//media/media_options.gni")
10 10
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 "video_renderer.h", 175 "video_renderer.h",
176 "video_rotation.h", 176 "video_rotation.h",
177 "video_util.cc", 177 "video_util.cc",
178 "video_util.h", 178 "video_util.h",
179 "wall_clock_time_source.cc", 179 "wall_clock_time_source.cc",
180 "wall_clock_time_source.h", 180 "wall_clock_time_source.h",
181 "yuv_convert.cc", 181 "yuv_convert.cc",
182 "yuv_convert.h", 182 "yuv_convert.h",
183 ] 183 ]
184 defines = [] 184 defines = []
185 deps = [ 185 deps = []
186 "//skia",
187 ]
188 libs = [] 186 libs = []
189 configs += [ "//media:media_config" ] 187 configs += [ "//media:media_config" ]
190 188
189 if (!is_ensemble) {
190 deps += [ "//skia" ]
191 }
192
191 if (media_use_ffmpeg) { 193 if (media_use_ffmpeg) {
192 sources += [ 194 sources += [
193 "audio_video_metadata_extractor.cc", 195 "audio_video_metadata_extractor.cc",
194 "audio_video_metadata_extractor.h", 196 "audio_video_metadata_extractor.h",
195 "container_names.cc", 197 "container_names.cc",
196 "container_names.h", 198 "container_names.h",
197 "media_file_checker.cc", 199 "media_file_checker.cc",
198 "media_file_checker.h", 200 "media_file_checker.h",
199 ] 201 ]
200 deps += [ "//third_party/ffmpeg" ] 202 deps += [ "//third_party/ffmpeg" ]
201 } 203 }
202 204
203 if (enable_browser_cdms) { 205 if (enable_browser_cdms) {
204 sources += [ 206 sources += [
205 "browser_cdm.cc", 207 "browser_cdm.cc",
206 "browser_cdm.h", 208 "browser_cdm.h",
207 "browser_cdm_factory.cc", 209 "browser_cdm_factory.cc",
208 "browser_cdm_factory.h", 210 "browser_cdm_factory.h",
209 ] 211 ]
210 } 212 }
211 213
212 if (is_android) { 214 if (is_android) {
213 sources += [ "media_stub.cc" ] 215 sources += [ "media_stub.cc" ]
214 } else if (is_win) { 216 } else if (is_win) {
215 sources += [ "media_win.cc" ] 217 sources += [ "media_win.cc" ]
216 } else if (is_posix) { 218 } else if (is_posix) {
217 sources += [ "media_posix.cc" ] 219 sources += [ "media_posix.cc" ]
218 } 220 }
219 221
220 if (is_linux && use_x11) { 222 if (is_linux && use_x11 && !is_ensemble) {
221 configs += [ 223 configs += [
222 "//build/config/linux:x11", 224 "//build/config/linux:x11",
223 "//build/config/linux:xext", 225 "//build/config/linux:xext",
224 226
225 # TODO(ajwong): Why does xent get a separate thing in //build/config/linux :BUILD.gn 227 # TODO(ajwong): Why does xent get a separate thing in //build/config/linux :BUILD.gn
226 # "//build/config/linux:xdamage", 228 # "//build/config/linux:xdamage",
227 # "//build/config/linux:xfixes", 229 # "//build/config/linux:xfixes",
228 # "//build/config/linux:xtst", 230 # "//build/config/linux:xtst",
229 ] 231 ]
230 sources += [ "user_input_monitor_linux.cc" ] 232 sources += [ "user_input_monitor_linux.cc" ]
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 if (is_posix) { 470 if (is_posix) {
469 yasm_flags += [ "-DELF" ] 471 yasm_flags += [ "-DELF" ]
470 if (cpu_arch == "x64") { 472 if (cpu_arch == "x64") {
471 # TODO(ajwong): Why isn't this true in mac? 473 # TODO(ajwong): Why isn't this true in mac?
472 yasm_flags += [ "-DPIC" ] 474 yasm_flags += [ "-DPIC" ]
473 } 475 }
474 } 476 }
475 } 477 }
476 } 478 }
477 } 479 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698