| OLD | NEW |
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 | 240 |
| 241 if (!is_ios || !build_with_chromium) { | 241 if (!is_ios || !build_with_chromium) { |
| 242 rtc_source_set("webrtc") { | 242 rtc_source_set("webrtc") { |
| 243 sources = [ | 243 sources = [ |
| 244 "call.h", | 244 "call.h", |
| 245 "config.h", | 245 "config.h", |
| 246 "transport.h", | 246 "transport.h", |
| 247 ] | 247 ] |
| 248 | 248 |
| 249 defines = [] | 249 defines = [] |
| 250 configs += [ ":common_config" ] | |
| 251 public_configs = [ ":common_inherited_config" ] | 250 public_configs = [ ":common_inherited_config" ] |
| 252 | 251 |
| 253 deps = [ | 252 deps = [ |
| 254 ":webrtc_common", | 253 ":webrtc_common", |
| 255 "audio", | 254 "audio", |
| 256 "base:rtc_base", | 255 "base:rtc_base", |
| 257 "call", | 256 "call", |
| 258 "common_audio", | 257 "common_audio", |
| 259 "common_video", | 258 "common_video", |
| 260 "modules", | 259 "modules", |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 "common.cc", | 330 "common.cc", |
| 332 "common.h", | 331 "common.h", |
| 333 "common_types.cc", | 332 "common_types.cc", |
| 334 "common_types.h", | 333 "common_types.h", |
| 335 "config.cc", | 334 "config.cc", |
| 336 "config.h", | 335 "config.h", |
| 337 "engine_configurations.h", | 336 "engine_configurations.h", |
| 338 "typedefs.h", | 337 "typedefs.h", |
| 339 ] | 338 ] |
| 340 | 339 |
| 341 configs += [ ":common_config" ] | |
| 342 public_configs = [ ":common_inherited_config" ] | 340 public_configs = [ ":common_inherited_config" ] |
| 343 | 341 |
| 344 if (is_clang && !is_nacl) { | 342 if (is_clang && !is_nacl) { |
| 345 # Suppress warnings from Chrome's Clang plugins. | 343 # Suppress warnings from Chrome's Clang plugins. |
| 346 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 344 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 347 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 345 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 348 } | 346 } |
| 349 } | 347 } |
| 350 | 348 |
| 351 if (rtc_enable_protobuf) { | 349 if (rtc_enable_protobuf) { |
| 352 proto_library("rtc_event_log_proto") { | 350 proto_library("rtc_event_log_proto") { |
| 353 sources = [ | 351 sources = [ |
| 354 "call/rtc_event_log.proto", | 352 "call/rtc_event_log.proto", |
| 355 ] | 353 ] |
| 356 proto_out_dir = "webrtc/call" | 354 proto_out_dir = "webrtc/call" |
| 357 } | 355 } |
| 358 } | 356 } |
| 359 | 357 |
| 360 rtc_source_set("rtc_event_log") { | 358 rtc_source_set("rtc_event_log") { |
| 361 sources = [ | 359 sources = [ |
| 362 "call/rtc_event_log.cc", | 360 "call/rtc_event_log.cc", |
| 363 "call/rtc_event_log.h", | 361 "call/rtc_event_log.h", |
| 364 "call/rtc_event_log_helper_thread.cc", | 362 "call/rtc_event_log_helper_thread.cc", |
| 365 "call/rtc_event_log_helper_thread.h", | 363 "call/rtc_event_log_helper_thread.h", |
| 366 ] | 364 ] |
| 367 | 365 |
| 368 defines = [] | 366 defines = [] |
| 369 configs += [ ":common_config" ] | |
| 370 public_configs = [ ":common_inherited_config" ] | 367 public_configs = [ ":common_inherited_config" ] |
| 371 | 368 |
| 372 deps = [ | 369 deps = [ |
| 373 ":webrtc_common", | 370 ":webrtc_common", |
| 374 "modules/rtp_rtcp", | 371 "modules/rtp_rtcp", |
| 375 ] | 372 ] |
| 376 | 373 |
| 377 if (rtc_enable_protobuf) { | 374 if (rtc_enable_protobuf) { |
| 378 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 375 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
| 379 deps += [ ":rtc_event_log_proto" ] | 376 deps += [ ":rtc_event_log_proto" ] |
| 380 } | 377 } |
| 381 if (is_clang && !is_nacl) { | 378 if (is_clang && !is_nacl) { |
| 382 # Suppress warnings from Chrome's Clang plugins. | 379 # Suppress warnings from Chrome's Clang plugins. |
| 383 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 380 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 384 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 381 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 385 } | 382 } |
| 386 } | 383 } |
| 387 | 384 |
| 388 if (rtc_enable_protobuf) { | 385 if (rtc_enable_protobuf) { |
| 389 rtc_source_set("rtc_event_log_parser") { | 386 rtc_source_set("rtc_event_log_parser") { |
| 390 sources = [ | 387 sources = [ |
| 391 "call/rtc_event_log_parser.cc", | 388 "call/rtc_event_log_parser.cc", |
| 392 "call/rtc_event_log_parser.h", | 389 "call/rtc_event_log_parser.h", |
| 393 ] | 390 ] |
| 394 | 391 |
| 395 configs += [ ":common_config" ] | |
| 396 public_configs = [ ":common_inherited_config" ] | 392 public_configs = [ ":common_inherited_config" ] |
| 397 | 393 |
| 398 public_deps = [ | 394 public_deps = [ |
| 399 ":rtc_event_log_proto", | 395 ":rtc_event_log_proto", |
| 400 ":webrtc_common", | 396 ":webrtc_common", |
| 401 ] | 397 ] |
| 402 | 398 |
| 403 if (is_clang && !is_nacl) { | 399 if (is_clang && !is_nacl) { |
| 404 # Suppress warnings from Chrome's Clang plugins. | 400 # Suppress warnings from Chrome's Clang plugins. |
| 405 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 401 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 if (rtc_use_quic) { | 575 if (rtc_use_quic) { |
| 580 sources += [ | 576 sources += [ |
| 581 "p2p/quic/quicconnectionhelper_unittest.cc", | 577 "p2p/quic/quicconnectionhelper_unittest.cc", |
| 582 "p2p/quic/quicsession_unittest.cc", | 578 "p2p/quic/quicsession_unittest.cc", |
| 583 "p2p/quic/quictransport_unittest.cc", | 579 "p2p/quic/quictransport_unittest.cc", |
| 584 "p2p/quic/quictransportchannel_unittest.cc", | 580 "p2p/quic/quictransportchannel_unittest.cc", |
| 585 "p2p/quic/reliablequicstream_unittest.cc", | 581 "p2p/quic/reliablequicstream_unittest.cc", |
| 586 ] | 582 ] |
| 587 } | 583 } |
| 588 | 584 |
| 589 configs += [ | 585 configs += [ ":rtc_unittests_config" ] |
| 590 ":common_config", | |
| 591 ":rtc_unittests_config", | |
| 592 ] | |
| 593 public_configs = [ ":common_inherited_config" ] | 586 public_configs = [ ":common_inherited_config" ] |
| 594 | 587 |
| 595 if (is_clang) { | 588 if (is_clang) { |
| 596 # Suppress warnings from the Chromium Clang plugin. | 589 # Suppress warnings from the Chromium Clang plugin. |
| 597 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 590 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 598 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 591 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 599 } | 592 } |
| 600 | 593 |
| 601 deps = [ | 594 deps = [ |
| 602 "base:rtc_base", | 595 "base:rtc_base", |
| (...skipping 28 matching lines...) Expand all Loading... |
| 631 cflags = [ "-Wno-objc-property-no-attribute" ] | 624 cflags = [ "-Wno-objc-property-no-attribute" ] |
| 632 | 625 |
| 633 # |-ObjC| flag needed to make sure category method implementations | 626 # |-ObjC| flag needed to make sure category method implementations |
| 634 # are included: | 627 # are included: |
| 635 # https://developer.apple.com/library/mac/qa/qa1490/_index.html | 628 # https://developer.apple.com/library/mac/qa/qa1490/_index.html |
| 636 ldflags = [ "-ObjC" ] | 629 ldflags = [ "-ObjC" ] |
| 637 } | 630 } |
| 638 } | 631 } |
| 639 | 632 |
| 640 rtc_test("xmllite_xmpp_unittests") { | 633 rtc_test("xmllite_xmpp_unittests") { |
| 641 configs += [ | 634 configs += [ ":rtc_unittests_config" ] |
| 642 ":common_config", | |
| 643 ":rtc_unittests_config", | |
| 644 ] | |
| 645 public_configs = [ ":common_inherited_config" ] | 635 public_configs = [ ":common_inherited_config" ] |
| 646 | 636 |
| 647 if (is_clang) { | 637 if (is_clang) { |
| 648 # Suppress warnings from the Chromium Clang plugin. | 638 # Suppress warnings from the Chromium Clang plugin. |
| 649 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 639 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 650 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 640 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 651 } | 641 } |
| 652 | 642 |
| 653 deps = [ | 643 deps = [ |
| 654 "base:rtc_base_tests_utils", | 644 "base:rtc_base_tests_utils", |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 shard_timeout = 900 | 711 shard_timeout = 900 |
| 722 } | 712 } |
| 723 | 713 |
| 724 if (is_ios) { | 714 if (is_ios) { |
| 725 deps += [ ":video_engine_tests_bundle_data" ] | 715 deps += [ ":video_engine_tests_bundle_data" ] |
| 726 } | 716 } |
| 727 } | 717 } |
| 728 | 718 |
| 729 rtc_source_set("video_quality_test") { | 719 rtc_source_set("video_quality_test") { |
| 730 testonly = true | 720 testonly = true |
| 731 configs += [ ":common_config" ] | |
| 732 public_configs = [ ":common_inherited_config" ] | 721 public_configs = [ ":common_inherited_config" ] |
| 733 sources = [ | 722 sources = [ |
| 734 "video/video_quality_test.cc", | 723 "video/video_quality_test.cc", |
| 735 "video/video_quality_test.h", | 724 "video/video_quality_test.h", |
| 736 ] | 725 ] |
| 737 deps = [ | 726 deps = [ |
| 738 ":webrtc", | 727 ":webrtc", |
| 739 "system_wrappers", | 728 "system_wrappers", |
| 740 "//testing/gtest", | 729 "//testing/gtest", |
| 741 ] | 730 ] |
| (...skipping 29 matching lines...) Expand all Loading... |
| 771 testonly = true | 760 testonly = true |
| 772 sources = webrtc_perf_tests_resources | 761 sources = webrtc_perf_tests_resources |
| 773 outputs = [ | 762 outputs = [ |
| 774 "{{bundle_resources_dir}}/{{source_file_part}}", | 763 "{{bundle_resources_dir}}/{{source_file_part}}", |
| 775 ] | 764 ] |
| 776 } | 765 } |
| 777 } | 766 } |
| 778 | 767 |
| 779 rtc_test("webrtc_perf_tests") { | 768 rtc_test("webrtc_perf_tests") { |
| 780 testonly = true | 769 testonly = true |
| 781 configs += [ | 770 configs += [ ":rtc_unittests_config" ] |
| 782 ":common_config", | |
| 783 ":rtc_unittests_config", | |
| 784 ] | |
| 785 public_configs = [ ":common_inherited_config" ] | 771 public_configs = [ ":common_inherited_config" ] |
| 786 | 772 |
| 787 if (!is_debug) { | 773 if (!is_debug) { |
| 788 suppressed_configs += [ "//build/config/compiler:default_optimization" ] | 774 suppressed_configs += [ "//build/config/compiler:default_optimization" ] |
| 789 configs += [ "//build/config/compiler:optimize_max" ] | 775 configs += [ "//build/config/compiler:optimize_max" ] |
| 790 } | 776 } |
| 791 | 777 |
| 792 sources = [ | 778 sources = [ |
| 793 "call/call_perf_tests.cc", | 779 "call/call_perf_tests.cc", |
| 794 "call/rampup_tests.cc", | 780 "call/rampup_tests.cc", |
| (...skipping 30 matching lines...) Expand all Loading... |
| 825 } | 811 } |
| 826 if (is_clang) { | 812 if (is_clang) { |
| 827 # Suppress warnings from the Chromium Clang plugin. | 813 # Suppress warnings from the Chromium Clang plugin. |
| 828 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 814 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 829 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 815 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 830 } | 816 } |
| 831 } | 817 } |
| 832 | 818 |
| 833 rtc_test("webrtc_nonparallel_tests") { | 819 rtc_test("webrtc_nonparallel_tests") { |
| 834 testonly = true | 820 testonly = true |
| 835 configs += [ | 821 configs += [ ":rtc_unittests_config" ] |
| 836 ":common_config", | |
| 837 ":rtc_unittests_config", | |
| 838 ] | |
| 839 public_configs = [ ":common_inherited_config" ] | 822 public_configs = [ ":common_inherited_config" ] |
| 840 sources = [ | 823 sources = [ |
| 841 "base/nullsocketserver_unittest.cc", | 824 "base/nullsocketserver_unittest.cc", |
| 842 "base/physicalsocketserver_unittest.cc", | 825 "base/physicalsocketserver_unittest.cc", |
| 843 "base/socket_unittest.cc", | 826 "base/socket_unittest.cc", |
| 844 "base/socket_unittest.h", | 827 "base/socket_unittest.h", |
| 845 "base/socketaddress_unittest.cc", | 828 "base/socketaddress_unittest.cc", |
| 846 "base/virtualsocket_unittest.cc", | 829 "base/virtualsocket_unittest.cc", |
| 847 ] | 830 ] |
| 848 deps = [ | 831 deps = [ |
| (...skipping 15 matching lines...) Expand all Loading... |
| 864 if (is_ios || (is_mac && target_cpu != "x86")) { | 847 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 865 defines = [ "CARBON_DEPRECATED=YES" ] | 848 defines = [ "CARBON_DEPRECATED=YES" ] |
| 866 } | 849 } |
| 867 if (is_clang) { | 850 if (is_clang) { |
| 868 # Suppress warnings from the Chromium Clang plugin. | 851 # Suppress warnings from the Chromium Clang plugin. |
| 869 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 852 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 870 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 853 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 871 } | 854 } |
| 872 } | 855 } |
| 873 } | 856 } |
| OLD | NEW |