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

Side by Side Diff: media/BUILD.gn

Issue 968663004: Improve MidiManagerAlsa manufacturer reporting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@udev
Patch Set: Undo incorrect use of MEDIA_IMPLEMENTATION Created 5 years, 9 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 | « no previous file | media/DEPS » ('j') | media/media.gyp » ('J')
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/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 352
353 if (use_alsa) { 353 if (use_alsa) {
354 libs += [ "asound" ] 354 libs += [ "asound" ]
355 defines += [ "USE_ALSA" ] 355 defines += [ "USE_ALSA" ]
356 sources += [ 356 sources += [
357 "midi/midi_manager_alsa.cc", 357 "midi/midi_manager_alsa.cc",
358 "midi/midi_manager_alsa.h", 358 "midi/midi_manager_alsa.h",
359 ] 359 ]
360 } 360 }
361 361
362 if (use_udev) {
363 deps += [ "//device/udev_linux" ]
364 }
365
362 # A simple WebM encoder for animated avatars on ChromeOS. 366 # A simple WebM encoder for animated avatars on ChromeOS.
363 367
364 if (use_ozone) { 368 if (use_ozone) {
365 # Used for the generated listing header (ui/ozone/platform_list.h) 369 # Used for the generated listing header (ui/ozone/platform_list.h)
366 include_dirs += [ target_gen_dir ] 370 include_dirs += [ target_gen_dir ]
367 371
368 sources += [ 372 sources += [
369 "ozone/media_ozone_platform.cc", 373 "ozone/media_ozone_platform.cc",
370 "ozone/media_ozone_platform.h", 374 "ozone/media_ozone_platform.h",
371 ] + get_target_outputs(":generate_ozone_constructor_list") 375 ] + get_target_outputs(":generate_ozone_constructor_list")
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 deps += [ "//media/base/mac" ] 666 deps += [ "//media/base/mac" ]
663 } 667 }
664 668
665 if (is_mac) { 669 if (is_mac) {
666 sources += [ 670 sources += [
667 "midi/midi_manager_mac_unittest.cc", 671 "midi/midi_manager_mac_unittest.cc",
668 "video/capture/mac/video_capture_device_factory_mac_unittest.mm", 672 "video/capture/mac/video_capture_device_factory_mac_unittest.mm",
669 ] 673 ]
670 } 674 }
671 675
676 if (use_alsa) {
677 sources += [ "midi/midi_manager_alsa_unittest.cc" ]
678 }
679
672 # include_dirs += [ 680 # include_dirs += [
673 # # Needed by media_drm_bridge.cc. 681 # # Needed by media_drm_bridge.cc.
674 # target_gen_dir, 682 # target_gen_dir,
675 # ], 683 # ],
676 684
677 configs += [ ":media_config" ] 685 configs += [ ":media_config" ]
678 686
679 if (media_use_ffmpeg) { 687 if (media_use_ffmpeg) {
680 deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config. 688 deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config.
681 } 689 }
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 deps = [ 804 deps = [
797 ":media", 805 ":media",
798 ":shared_memory_support", 806 ":shared_memory_support",
799 "//base", 807 "//base",
800 "//ui/gl", 808 "//ui/gl",
801 "//ui/gfx", 809 "//ui/gfx",
802 "//ui/gfx/geometry", 810 "//ui/gfx/geometry",
803 ] 811 ]
804 } 812 }
805 } 813 }
OLDNEW
« no previous file with comments | « no previous file | media/DEPS » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698