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

Side by Side Diff: media/base/BUILD.gn

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile 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/audio/win/audio_manager_win.cc ('k') | media/base/android/media_decoder_job.cc » ('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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 "audio_renderer_mixer.h", 42 "audio_renderer_mixer.h",
43 "audio_renderer_mixer_input.cc", 43 "audio_renderer_mixer_input.cc",
44 "audio_renderer_mixer_input.h", 44 "audio_renderer_mixer_input.h",
45 "audio_renderer_sink.h", 45 "audio_renderer_sink.h",
46 "audio_shifter.cc", 46 "audio_shifter.cc",
47 "audio_shifter.h", 47 "audio_shifter.h",
48 "audio_splicer.cc", 48 "audio_splicer.cc",
49 "audio_splicer.h", 49 "audio_splicer.h",
50 "audio_timestamp_helper.cc", 50 "audio_timestamp_helper.cc",
51 "audio_timestamp_helper.h", 51 "audio_timestamp_helper.h",
52 "bind_to_current_loop.h",
53 "bit_reader.cc", 52 "bit_reader.cc",
54 "bit_reader.h", 53 "bit_reader.h",
55 "bit_reader_core.cc", 54 "bit_reader_core.cc",
56 "bit_reader_core.h", 55 "bit_reader_core.h",
57 "bitstream_buffer.h", 56 "bitstream_buffer.h",
58 "buffering_state.h", 57 "buffering_state.h",
59 "buffers.h", 58 "buffers.h",
60 "byte_queue.cc", 59 "byte_queue.cc",
61 "byte_queue.h", 60 "byte_queue.h",
62 "cdm_callback_promise.cc", 61 "cdm_callback_promise.cc",
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 ] 233 ]
235 sources += [ "user_input_monitor_linux.cc" ] 234 sources += [ "user_input_monitor_linux.cc" ]
236 deps += [ 235 deps += [
237 "//ui/events:events_base", 236 "//ui/events:events_base",
238 "//ui/gfx/x", 237 "//ui/gfx/x",
239 ] 238 ]
240 } else if (is_mac) { 239 } else if (is_mac) {
241 sources += [ "user_input_monitor_mac.cc" ] 240 sources += [ "user_input_monitor_mac.cc" ]
242 241
243 # Required by video_frame.cc. 242 # Required by video_frame.cc.
244 libs = [ 243 libs = [ "CoreVideo.framework" ]
245 "CoreVideo.framework"
246 ]
247 } else if (is_win) { 244 } else if (is_win) {
248 sources += [ "user_input_monitor_win.cc" ] 245 sources += [ "user_input_monitor_win.cc" ]
249 } else { 246 } else {
250 defines += [ "DISABLE_USER_INPUT_MONITOR" ] 247 defines += [ "DISABLE_USER_INPUT_MONITOR" ]
251 } 248 }
252 249
253 if (current_cpu == "x86" || current_cpu == "x64") { 250 if (current_cpu == "x86" || current_cpu == "x64") {
254 sources += [ "simd/convert_yuv_to_rgb_x86.cc" ] 251 sources += [ "simd/convert_yuv_to_rgb_x86.cc" ]
255 deps += [ 252 deps += [
256 ":media_yasm", 253 ":media_yasm",
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 "audio_discard_helper_unittest.cc", 333 "audio_discard_helper_unittest.cc",
337 "audio_fifo_unittest.cc", 334 "audio_fifo_unittest.cc",
338 "audio_hardware_config_unittest.cc", 335 "audio_hardware_config_unittest.cc",
339 "audio_hash_unittest.cc", 336 "audio_hash_unittest.cc",
340 "audio_pull_fifo_unittest.cc", 337 "audio_pull_fifo_unittest.cc",
341 "audio_renderer_mixer_input_unittest.cc", 338 "audio_renderer_mixer_input_unittest.cc",
342 "audio_renderer_mixer_unittest.cc", 339 "audio_renderer_mixer_unittest.cc",
343 "audio_shifter_unittest.cc", 340 "audio_shifter_unittest.cc",
344 "audio_splicer_unittest.cc", 341 "audio_splicer_unittest.cc",
345 "audio_timestamp_helper_unittest.cc", 342 "audio_timestamp_helper_unittest.cc",
346 "bind_to_current_loop_unittest.cc",
347 "bit_reader_unittest.cc", 343 "bit_reader_unittest.cc",
348 "callback_holder.h", 344 "callback_holder.h",
349 "callback_holder_unittest.cc", 345 "callback_holder_unittest.cc",
350 "channel_mixer_unittest.cc", 346 "channel_mixer_unittest.cc",
351 "channel_mixing_matrix_unittest.cc", 347 "channel_mixing_matrix_unittest.cc",
352 "data_buffer_unittest.cc", 348 "data_buffer_unittest.cc",
353 "decoder_buffer_queue_unittest.cc", 349 "decoder_buffer_queue_unittest.cc",
354 "decoder_buffer_unittest.cc", 350 "decoder_buffer_unittest.cc",
355 "djb2_unittest.cc", 351 "djb2_unittest.cc",
356 "gmock_callback_support_unittest.cc", 352 "gmock_callback_support_unittest.cc",
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 if (is_posix) { 494 if (is_posix) {
499 yasm_flags += [ "-DELF" ] 495 yasm_flags += [ "-DELF" ]
500 if (current_cpu == "x64") { 496 if (current_cpu == "x64") {
501 # TODO(ajwong): Why isn't this true in mac? 497 # TODO(ajwong): Why isn't this true in mac?
502 yasm_flags += [ "-DPIC" ] 498 yasm_flags += [ "-DPIC" ]
503 } 499 }
504 } 500 }
505 } 501 }
506 } 502 }
507 } 503 }
OLDNEW
« no previous file with comments | « media/audio/win/audio_manager_win.cc ('k') | media/base/android/media_decoder_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698