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

Side by Side Diff: media/BUILD.gn

Issue 1089773003: Revert of Fix errors found in Mac gn component builds (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 | « gpu/command_buffer_service.gypi ('k') | media/base/BUILD.gn » ('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/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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 675
676 if (is_mac || is_ios) { 676 if (is_mac || is_ios) {
677 deps += [ "//media/base/mac" ] 677 deps += [ "//media/base/mac" ]
678 } 678 }
679 679
680 if (is_mac) { 680 if (is_mac) {
681 sources += [ 681 sources += [
682 "midi/midi_manager_mac_unittest.cc", 682 "midi/midi_manager_mac_unittest.cc",
683 "video/capture/mac/video_capture_device_factory_mac_unittest.mm", 683 "video/capture/mac/video_capture_device_factory_mac_unittest.mm",
684 ] 684 ]
685 libs = [
686 # Required by midi_manager_mac_unittest.cc.
687 "CoreMIDI.framework",
688 ]
689 } 685 }
690 686
691 if (use_alsa) { 687 if (use_alsa) {
692 sources += [ "midi/midi_manager_alsa_unittest.cc" ] 688 sources += [ "midi/midi_manager_alsa_unittest.cc" ]
693 } 689 }
694 690
695 # include_dirs += [ 691 # include_dirs += [
696 # # Needed by media_drm_bridge.cc. 692 # # Needed by media_drm_bridge.cc.
697 # target_gen_dir, 693 # target_gen_dir,
698 # ], 694 # ],
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 ":media", 816 ":media",
821 ":shared_memory_support", 817 ":shared_memory_support",
822 "//base", 818 "//base",
823 "//tools/xdisplaycheck", 819 "//tools/xdisplaycheck",
824 "//ui/gl", 820 "//ui/gl",
825 "//ui/gfx", 821 "//ui/gfx",
826 "//ui/gfx/geometry", 822 "//ui/gfx/geometry",
827 ] 823 ]
828 } 824 }
829 } 825 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698