| 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 public_configs = [ ":common_inherited_config" ] | |
| 251 | 250 |
| 252 deps = [ | 251 deps = [ |
| 253 ":webrtc_common", | 252 ":webrtc_common", |
| 254 "audio", | 253 "audio", |
| 255 "base:rtc_base", | 254 "base:rtc_base", |
| 256 "call", | 255 "call", |
| 257 "common_audio", | 256 "common_audio", |
| 258 "common_video", | 257 "common_video", |
| 259 "modules", | 258 "modules", |
| 260 "stats", | 259 "stats", |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 "common.cc", | 329 "common.cc", |
| 331 "common.h", | 330 "common.h", |
| 332 "common_types.cc", | 331 "common_types.cc", |
| 333 "common_types.h", | 332 "common_types.h", |
| 334 "config.cc", | 333 "config.cc", |
| 335 "config.h", | 334 "config.h", |
| 336 "engine_configurations.h", | 335 "engine_configurations.h", |
| 337 "typedefs.h", | 336 "typedefs.h", |
| 338 ] | 337 ] |
| 339 | 338 |
| 340 public_configs = [ ":common_inherited_config" ] | |
| 341 | |
| 342 if (is_clang && !is_nacl) { | 339 if (is_clang && !is_nacl) { |
| 343 # Suppress warnings from Chrome's Clang plugins. | 340 # Suppress warnings from Chrome's Clang plugins. |
| 344 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 341 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 345 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 342 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 346 } | 343 } |
| 347 } | 344 } |
| 348 | 345 |
| 349 if (rtc_enable_protobuf) { | 346 if (rtc_enable_protobuf) { |
| 350 proto_library("rtc_event_log_proto") { | 347 proto_library("rtc_event_log_proto") { |
| 351 sources = [ | 348 sources = [ |
| 352 "call/rtc_event_log.proto", | 349 "call/rtc_event_log.proto", |
| 353 ] | 350 ] |
| 354 proto_out_dir = "webrtc/call" | 351 proto_out_dir = "webrtc/call" |
| 355 } | 352 } |
| 356 } | 353 } |
| 357 | 354 |
| 358 rtc_source_set("rtc_event_log") { | 355 rtc_source_set("rtc_event_log") { |
| 359 sources = [ | 356 sources = [ |
| 360 "call/rtc_event_log.cc", | 357 "call/rtc_event_log.cc", |
| 361 "call/rtc_event_log.h", | 358 "call/rtc_event_log.h", |
| 362 "call/rtc_event_log_helper_thread.cc", | 359 "call/rtc_event_log_helper_thread.cc", |
| 363 "call/rtc_event_log_helper_thread.h", | 360 "call/rtc_event_log_helper_thread.h", |
| 364 ] | 361 ] |
| 365 | 362 |
| 366 defines = [] | 363 defines = [] |
| 367 public_configs = [ ":common_inherited_config" ] | |
| 368 | 364 |
| 369 deps = [ | 365 deps = [ |
| 370 ":webrtc_common", | 366 ":webrtc_common", |
| 371 "modules/rtp_rtcp", | 367 "modules/rtp_rtcp", |
| 372 ] | 368 ] |
| 373 | 369 |
| 374 if (rtc_enable_protobuf) { | 370 if (rtc_enable_protobuf) { |
| 375 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 371 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
| 376 deps += [ ":rtc_event_log_proto" ] | 372 deps += [ ":rtc_event_log_proto" ] |
| 377 } | 373 } |
| 378 if (is_clang && !is_nacl) { | 374 if (is_clang && !is_nacl) { |
| 379 # Suppress warnings from Chrome's Clang plugins. | 375 # Suppress warnings from Chrome's Clang plugins. |
| 380 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 376 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 381 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 377 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 382 } | 378 } |
| 383 } | 379 } |
| 384 | 380 |
| 385 if (rtc_enable_protobuf) { | 381 if (rtc_enable_protobuf) { |
| 386 rtc_source_set("rtc_event_log_parser") { | 382 rtc_source_set("rtc_event_log_parser") { |
| 387 sources = [ | 383 sources = [ |
| 388 "call/rtc_event_log_parser.cc", | 384 "call/rtc_event_log_parser.cc", |
| 389 "call/rtc_event_log_parser.h", | 385 "call/rtc_event_log_parser.h", |
| 390 ] | 386 ] |
| 391 | 387 |
| 392 public_configs = [ ":common_inherited_config" ] | |
| 393 | |
| 394 public_deps = [ | 388 public_deps = [ |
| 395 ":rtc_event_log_proto", | 389 ":rtc_event_log_proto", |
| 396 ":webrtc_common", | 390 ":webrtc_common", |
| 397 ] | 391 ] |
| 398 | 392 |
| 399 if (is_clang && !is_nacl) { | 393 if (is_clang && !is_nacl) { |
| 400 # Suppress warnings from Chrome's Clang plugins. | 394 # Suppress warnings from Chrome's Clang plugins. |
| 401 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 395 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 402 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 396 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 403 } | 397 } |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 sources += [ | 570 sources += [ |
| 577 "p2p/quic/quicconnectionhelper_unittest.cc", | 571 "p2p/quic/quicconnectionhelper_unittest.cc", |
| 578 "p2p/quic/quicsession_unittest.cc", | 572 "p2p/quic/quicsession_unittest.cc", |
| 579 "p2p/quic/quictransport_unittest.cc", | 573 "p2p/quic/quictransport_unittest.cc", |
| 580 "p2p/quic/quictransportchannel_unittest.cc", | 574 "p2p/quic/quictransportchannel_unittest.cc", |
| 581 "p2p/quic/reliablequicstream_unittest.cc", | 575 "p2p/quic/reliablequicstream_unittest.cc", |
| 582 ] | 576 ] |
| 583 } | 577 } |
| 584 | 578 |
| 585 configs += [ ":rtc_unittests_config" ] | 579 configs += [ ":rtc_unittests_config" ] |
| 586 public_configs = [ ":common_inherited_config" ] | |
| 587 | 580 |
| 588 if (is_clang) { | 581 if (is_clang) { |
| 589 # Suppress warnings from the Chromium Clang plugin. | 582 # Suppress warnings from the Chromium Clang plugin. |
| 590 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 583 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 591 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 584 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 592 } | 585 } |
| 593 | 586 |
| 594 deps = [ | 587 deps = [ |
| 595 "base:rtc_base", | 588 "base:rtc_base", |
| 596 "base:rtc_base_tests_utils", | 589 "base:rtc_base_tests_utils", |
| (...skipping 28 matching lines...) Expand all Loading... |
| 625 | 618 |
| 626 # |-ObjC| flag needed to make sure category method implementations | 619 # |-ObjC| flag needed to make sure category method implementations |
| 627 # are included: | 620 # are included: |
| 628 # https://developer.apple.com/library/mac/qa/qa1490/_index.html | 621 # https://developer.apple.com/library/mac/qa/qa1490/_index.html |
| 629 ldflags = [ "-ObjC" ] | 622 ldflags = [ "-ObjC" ] |
| 630 } | 623 } |
| 631 } | 624 } |
| 632 | 625 |
| 633 rtc_test("xmllite_xmpp_unittests") { | 626 rtc_test("xmllite_xmpp_unittests") { |
| 634 configs += [ ":rtc_unittests_config" ] | 627 configs += [ ":rtc_unittests_config" ] |
| 635 public_configs = [ ":common_inherited_config" ] | |
| 636 | 628 |
| 637 if (is_clang) { | 629 if (is_clang) { |
| 638 # Suppress warnings from the Chromium Clang plugin. | 630 # Suppress warnings from the Chromium Clang plugin. |
| 639 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 631 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 640 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 632 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 641 } | 633 } |
| 642 | 634 |
| 643 deps = [ | 635 deps = [ |
| 644 "base:rtc_base_tests_utils", | 636 "base:rtc_base_tests_utils", |
| 645 "libjingle/xmllite:rtc_xmllite", | 637 "libjingle/xmllite:rtc_xmllite", |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 711 shard_timeout = 900 | 703 shard_timeout = 900 |
| 712 } | 704 } |
| 713 | 705 |
| 714 if (is_ios) { | 706 if (is_ios) { |
| 715 deps += [ ":video_engine_tests_bundle_data" ] | 707 deps += [ ":video_engine_tests_bundle_data" ] |
| 716 } | 708 } |
| 717 } | 709 } |
| 718 | 710 |
| 719 rtc_source_set("video_quality_test") { | 711 rtc_source_set("video_quality_test") { |
| 720 testonly = true | 712 testonly = true |
| 721 public_configs = [ ":common_inherited_config" ] | |
| 722 sources = [ | 713 sources = [ |
| 723 "video/video_quality_test.cc", | 714 "video/video_quality_test.cc", |
| 724 "video/video_quality_test.h", | 715 "video/video_quality_test.h", |
| 725 ] | 716 ] |
| 726 deps = [ | 717 deps = [ |
| 727 ":webrtc", | 718 ":webrtc", |
| 728 "system_wrappers", | 719 "system_wrappers", |
| 729 "//testing/gtest", | 720 "//testing/gtest", |
| 730 ] | 721 ] |
| 731 if (!is_android) { | 722 if (!is_android) { |
| (...skipping 29 matching lines...) Expand all Loading... |
| 761 sources = webrtc_perf_tests_resources | 752 sources = webrtc_perf_tests_resources |
| 762 outputs = [ | 753 outputs = [ |
| 763 "{{bundle_resources_dir}}/{{source_file_part}}", | 754 "{{bundle_resources_dir}}/{{source_file_part}}", |
| 764 ] | 755 ] |
| 765 } | 756 } |
| 766 } | 757 } |
| 767 | 758 |
| 768 rtc_test("webrtc_perf_tests") { | 759 rtc_test("webrtc_perf_tests") { |
| 769 testonly = true | 760 testonly = true |
| 770 configs += [ ":rtc_unittests_config" ] | 761 configs += [ ":rtc_unittests_config" ] |
| 771 public_configs = [ ":common_inherited_config" ] | |
| 772 | 762 |
| 773 sources = [ | 763 sources = [ |
| 774 "call/call_perf_tests.cc", | 764 "call/call_perf_tests.cc", |
| 775 "call/rampup_tests.cc", | 765 "call/rampup_tests.cc", |
| 776 "call/rampup_tests.h", | 766 "call/rampup_tests.h", |
| 777 "modules/audio_coding/neteq/test/neteq_performance_unittest.cc", | 767 "modules/audio_coding/neteq/test/neteq_performance_unittest.cc", |
| 778 "modules/audio_processing/audio_processing_performance_unittest.cc", | 768 "modules/audio_processing/audio_processing_performance_unittest.cc", |
| 779 "modules/audio_processing/level_controller/level_controller_complexity_uni
ttest.cc", | 769 "modules/audio_processing/level_controller/level_controller_complexity_uni
ttest.cc", |
| 780 "modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc", | 770 "modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc", |
| 781 "video/full_stack.cc", | 771 "video/full_stack.cc", |
| (...skipping 25 matching lines...) Expand all Loading... |
| 807 if (is_clang) { | 797 if (is_clang) { |
| 808 # Suppress warnings from the Chromium Clang plugin. | 798 # Suppress warnings from the Chromium Clang plugin. |
| 809 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 799 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 810 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 800 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 811 } | 801 } |
| 812 } | 802 } |
| 813 | 803 |
| 814 rtc_test("webrtc_nonparallel_tests") { | 804 rtc_test("webrtc_nonparallel_tests") { |
| 815 testonly = true | 805 testonly = true |
| 816 configs += [ ":rtc_unittests_config" ] | 806 configs += [ ":rtc_unittests_config" ] |
| 817 public_configs = [ ":common_inherited_config" ] | |
| 818 sources = [ | 807 sources = [ |
| 819 "base/nullsocketserver_unittest.cc", | 808 "base/nullsocketserver_unittest.cc", |
| 820 "base/physicalsocketserver_unittest.cc", | 809 "base/physicalsocketserver_unittest.cc", |
| 821 "base/socket_unittest.cc", | 810 "base/socket_unittest.cc", |
| 822 "base/socket_unittest.h", | 811 "base/socket_unittest.h", |
| 823 "base/socketaddress_unittest.cc", | 812 "base/socketaddress_unittest.cc", |
| 824 "base/virtualsocket_unittest.cc", | 813 "base/virtualsocket_unittest.cc", |
| 825 ] | 814 ] |
| 826 deps = [ | 815 deps = [ |
| 827 "base:rtc_base", | 816 "base:rtc_base", |
| (...skipping 14 matching lines...) Expand all Loading... |
| 842 if (is_ios || (is_mac && target_cpu != "x86")) { | 831 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 843 defines = [ "CARBON_DEPRECATED=YES" ] | 832 defines = [ "CARBON_DEPRECATED=YES" ] |
| 844 } | 833 } |
| 845 if (is_clang) { | 834 if (is_clang) { |
| 846 # Suppress warnings from the Chromium Clang plugin. | 835 # Suppress warnings from the Chromium Clang plugin. |
| 847 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 836 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 848 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 837 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 849 } | 838 } |
| 850 } | 839 } |
| 851 } | 840 } |
| OLD | NEW |