Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 629 "formats/mp4/es_descriptor_unittest.cc", | 629 "formats/mp4/es_descriptor_unittest.cc", |
| 630 "formats/mp4/mp4_stream_parser_unittest.cc", | 630 "formats/mp4/mp4_stream_parser_unittest.cc", |
| 631 "formats/mp4/sample_to_group_iterator_unittest.cc", | 631 "formats/mp4/sample_to_group_iterator_unittest.cc", |
| 632 "formats/mp4/track_run_iterator_unittest.cc", | 632 "formats/mp4/track_run_iterator_unittest.cc", |
| 633 "formats/mpeg/adts_stream_parser_unittest.cc", | 633 "formats/mpeg/adts_stream_parser_unittest.cc", |
| 634 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc", | 634 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc", |
| 635 ] | 635 ] |
| 636 } | 636 } |
| 637 | 637 |
| 638 if (is_win && cpu_arch == "x64") { | 638 if (is_win && cpu_arch == "x64") { |
| 639 cflags += [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in w in64. See | 639 cflags = [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in wi n64. See |
| 640 # http://crbug.com/171009 | 640 # http://crbug.com/171009 |
|
dmichael (off chromium)
2015/02/12 18:56:43
This change probably belongs in a different CL?
brettw
2015/02/12 21:09:34
This change started as a GN build fix. This was th
| |
| 641 } | 641 } |
| 642 | 642 |
| 643 if (is_mac || is_ios) { | 643 if (is_mac || is_ios) { |
| 644 deps += [ "//media/base/mac" ] | 644 deps += [ "//media/base/mac" ] |
| 645 } | 645 } |
| 646 | 646 |
| 647 if (is_mac) { | 647 if (is_mac) { |
| 648 sources += | 648 sources += |
| 649 [ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ] | 649 [ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ] |
| 650 } | 650 } |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 776 deps = [ | 776 deps = [ |
| 777 ":media", | 777 ":media", |
| 778 ":shared_memory_support", | 778 ":shared_memory_support", |
| 779 "//base", | 779 "//base", |
| 780 "//ui/gl", | 780 "//ui/gl", |
| 781 "//ui/gfx", | 781 "//ui/gfx", |
| 782 "//ui/gfx/geometry", | 782 "//ui/gfx/geometry", |
| 783 ] | 783 ] |
| 784 } | 784 } |
| 785 } | 785 } |
| OLD | NEW |