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

Side by Side Diff: media/BUILD.gn

Issue 929793006: Update existing uses of /wd4267 to use the GN config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x64
Patch Set: Created 5 years, 10 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/config/BUILD.gn ('k') | media/cdm/ppapi/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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 "video/h264_poc.cc", 245 "video/h264_poc.cc",
246 "video/h264_poc.h", 246 "video/h264_poc.h",
247 "video/picture.cc", 247 "video/picture.cc",
248 "video/picture.h", 248 "video/picture.h",
249 "video/video_decode_accelerator.cc", 249 "video/video_decode_accelerator.cc",
250 "video/video_decode_accelerator.h", 250 "video/video_decode_accelerator.h",
251 "video/video_encode_accelerator.cc", 251 "video/video_encode_accelerator.cc",
252 "video/video_encode_accelerator.h", 252 "video/video_encode_accelerator.h",
253 ] 253 ]
254 254
255 configs += [ ":media_config" ] 255 configs += [
256 ":media_config",
257 # TODO(wolenetz): Fix size_t to int trunctaion in win64.
258 # See http://crbug.com/171009
259 "//build/config/compiler:no_size_t_to_int_warning",
260 ]
256 all_dependent_configs = [ ":media_dependent_config" ] 261 all_dependent_configs = [ ":media_dependent_config" ]
257 262
258 cflags = [] 263 cflags = []
259 libs = [] 264 libs = []
260 defines = [] 265 defines = []
261 deps = [] 266 deps = []
262 267
263 include_dirs = [ "." ] 268 include_dirs = [ "." ]
264 if (media_use_ffmpeg) { 269 if (media_use_ffmpeg) {
265 deps += [ "//third_party/ffmpeg" ] 270 deps += [ "//third_party/ffmpeg" ]
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 deps += [ "//media/base/mac" ] 392 deps += [ "//media/base/mac" ]
388 } 393 }
389 394
390 if (is_win) { 395 if (is_win) {
391 libs += [ 396 libs += [
392 "mf.lib", 397 "mf.lib",
393 "mfplat.lib", 398 "mfplat.lib",
394 "mfreadwrite.lib", 399 "mfreadwrite.lib",
395 "mfuuid.lib", 400 "mfuuid.lib",
396 ] 401 ]
397 cflags += [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in w in64. See
398 # http://crbug.com/171009
399 } 402 }
400 403
401 if (proprietary_codecs) { 404 if (proprietary_codecs) {
402 sources += [ 405 sources += [
403 "filters/h264_to_annex_b_bitstream_converter.cc", 406 "filters/h264_to_annex_b_bitstream_converter.cc",
404 "filters/h264_to_annex_b_bitstream_converter.h", 407 "filters/h264_to_annex_b_bitstream_converter.h",
405 "formats/mp2t/es_adapter_video.cc", 408 "formats/mp2t/es_adapter_video.cc",
406 "formats/mp2t/es_adapter_video.h", 409 "formats/mp2t/es_adapter_video.h",
407 "formats/mp2t/es_parser.cc", 410 "formats/mp2t/es_parser.cc",
408 "formats/mp2t/es_parser.h", 411 "formats/mp2t/es_parser.h",
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 "midi/midi_message_queue_unittest.cc", 575 "midi/midi_message_queue_unittest.cc",
573 "midi/midi_message_util_unittest.cc", 576 "midi/midi_message_util_unittest.cc",
574 "midi/usb_midi_descriptor_parser_unittest.cc", 577 "midi/usb_midi_descriptor_parser_unittest.cc",
575 "midi/usb_midi_input_stream_unittest.cc", 578 "midi/usb_midi_input_stream_unittest.cc",
576 "midi/usb_midi_output_stream_unittest.cc", 579 "midi/usb_midi_output_stream_unittest.cc",
577 "video/capture/fake_video_capture_device_unittest.cc", 580 "video/capture/fake_video_capture_device_unittest.cc",
578 "video/capture/video_capture_device_unittest.cc", 581 "video/capture/video_capture_device_unittest.cc",
579 "video/h264_poc_unittest.cc", 582 "video/h264_poc_unittest.cc",
580 ] 583 ]
581 584
585 # TODO(wolenetz): Fix size_t to int trunctaion in win64.
586 # See http://crbug.com/171009
587 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
588
582 deps = [ 589 deps = [
583 ":media", 590 ":media",
584 ":test_support", 591 ":test_support",
585 "//base/allocator", 592 "//base/allocator",
586 "//base/test:test_support", 593 "//base/test:test_support",
587 "//media/audio:unittests", 594 "//media/audio:unittests",
588 "//media/audio:test_support", 595 "//media/audio:test_support",
589 "//media/base:unittests", 596 "//media/base:unittests",
590 "//media/base:test_support", 597 "//media/base:test_support",
591 "//media/test:pipeline_integration_tests", 598 "//media/test:pipeline_integration_tests",
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 "formats/mp4/box_reader_unittest.cc", 649 "formats/mp4/box_reader_unittest.cc",
643 "formats/mp4/es_descriptor_unittest.cc", 650 "formats/mp4/es_descriptor_unittest.cc",
644 "formats/mp4/mp4_stream_parser_unittest.cc", 651 "formats/mp4/mp4_stream_parser_unittest.cc",
645 "formats/mp4/sample_to_group_iterator_unittest.cc", 652 "formats/mp4/sample_to_group_iterator_unittest.cc",
646 "formats/mp4/track_run_iterator_unittest.cc", 653 "formats/mp4/track_run_iterator_unittest.cc",
647 "formats/mpeg/adts_stream_parser_unittest.cc", 654 "formats/mpeg/adts_stream_parser_unittest.cc",
648 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc", 655 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc",
649 ] 656 ]
650 } 657 }
651 658
652 if (is_win && cpu_arch == "x64") {
653 cflags = [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in wi n64. See
654 # http://crbug.com/171009
655 }
656
657 if (is_mac || is_ios) { 659 if (is_mac || is_ios) {
658 deps += [ "//media/base/mac" ] 660 deps += [ "//media/base/mac" ]
659 } 661 }
660 662
661 if (is_mac) { 663 if (is_mac) {
662 sources += 664 sources +=
663 [ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ] 665 [ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ]
664 } 666 }
665 667
666 # include_dirs += [ 668 # include_dirs += [
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 deps = [ 792 deps = [
791 ":media", 793 ":media",
792 ":shared_memory_support", 794 ":shared_memory_support",
793 "//base", 795 "//base",
794 "//ui/gl", 796 "//ui/gl",
795 "//ui/gfx", 797 "//ui/gfx",
796 "//ui/gfx/geometry", 798 "//ui/gfx/geometry",
797 ] 799 ]
798 } 800 }
799 } 801 }
OLDNEW
« no previous file with comments | « gpu/config/BUILD.gn ('k') | media/cdm/ppapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698