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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « media/BUILD.gn ('k') | media/media_options.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 "video_renderer.h", 180 "video_renderer.h",
181 "video_rotation.h", 181 "video_rotation.h",
182 "video_util.cc", 182 "video_util.cc",
183 "video_util.h", 183 "video_util.h",
184 "wall_clock_time_source.cc", 184 "wall_clock_time_source.cc",
185 "wall_clock_time_source.h", 185 "wall_clock_time_source.h",
186 "yuv_convert.cc", 186 "yuv_convert.cc",
187 "yuv_convert.h", 187 "yuv_convert.h",
188 ] 188 ]
189 defines = [] 189 defines = []
190 deps = [] 190 deps = [
191 "//skia",
192 ]
191 libs = [] 193 libs = []
192 configs += [ "//media:media_config" ] 194 configs += [ "//media:media_config" ]
193 195
194 if (!is_ensemble) {
195 deps += [ "//skia" ]
196 }
197
198 if (media_use_ffmpeg) { 196 if (media_use_ffmpeg) {
199 sources += [ 197 sources += [
200 "audio_video_metadata_extractor.cc", 198 "audio_video_metadata_extractor.cc",
201 "audio_video_metadata_extractor.h", 199 "audio_video_metadata_extractor.h",
202 "container_names.cc", 200 "container_names.cc",
203 "container_names.h", 201 "container_names.h",
204 "media_file_checker.cc", 202 "media_file_checker.cc",
205 "media_file_checker.h", 203 "media_file_checker.h",
206 ] 204 ]
207 deps += [ "//third_party/ffmpeg" ] 205 deps += [ "//third_party/ffmpeg" ]
208 } 206 }
209 207
210 if (enable_browser_cdms) { 208 if (enable_browser_cdms) {
211 sources += [ 209 sources += [
212 "browser_cdm.cc", 210 "browser_cdm.cc",
213 "browser_cdm.h", 211 "browser_cdm.h",
214 "browser_cdm_factory.cc", 212 "browser_cdm_factory.cc",
215 "browser_cdm_factory.h", 213 "browser_cdm_factory.h",
216 ] 214 ]
217 } 215 }
218 216
219 if (is_android) { 217 if (is_android) {
220 sources += [ "media_stub.cc" ] 218 sources += [ "media_stub.cc" ]
221 } else if (is_win) { 219 } else if (is_win) {
222 sources += [ "media_win.cc" ] 220 sources += [ "media_win.cc" ]
223 } else if (is_posix) { 221 } else if (is_posix) {
224 sources += [ "media_posix.cc" ] 222 sources += [ "media_posix.cc" ]
225 } 223 }
226 224
227 if (is_linux && use_x11 && !is_ensemble) { 225 if (is_linux && use_x11) {
228 configs += [ 226 configs += [
229 "//build/config/linux:x11", 227 "//build/config/linux:x11",
230 "//build/config/linux:xext", 228 "//build/config/linux:xext",
231 229
232 # TODO(ajwong): Why does xent get a separate thing in //build/config/linux :BUILD.gn 230 # TODO(ajwong): Why does xent get a separate thing in //build/config/linux :BUILD.gn
233 # "//build/config/linux:xdamage", 231 # "//build/config/linux:xdamage",
234 # "//build/config/linux:xfixes", 232 # "//build/config/linux:xfixes",
235 # "//build/config/linux:xtst", 233 # "//build/config/linux:xtst",
236 ] 234 ]
237 sources += [ "user_input_monitor_linux.cc" ] 235 sources += [ "user_input_monitor_linux.cc" ]
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 if (is_posix) { 493 if (is_posix) {
496 yasm_flags += [ "-DELF" ] 494 yasm_flags += [ "-DELF" ]
497 if (current_cpu == "x64") { 495 if (current_cpu == "x64") {
498 # TODO(ajwong): Why isn't this true in mac? 496 # TODO(ajwong): Why isn't this true in mac?
499 yasm_flags += [ "-DPIC" ] 497 yasm_flags += [ "-DPIC" ]
500 } 498 }
501 } 499 }
502 } 500 }
503 } 501 }
504 } 502 }
OLDNEW
« 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