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 import("//build/config/crypto.gni") | 9 import("//build/config/crypto.gni") |
10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
74 if (!rtc_build_ssl) { | 74 if (!rtc_build_ssl) { |
75 config("external_ssl_library") { | 75 config("external_ssl_library") { |
76 assert(rtc_ssl_root != "", | 76 assert(rtc_ssl_root != "", |
77 "You must specify rtc_ssl_root when rtc_build_ssl==0.") | 77 "You must specify rtc_ssl_root when rtc_build_ssl==0.") |
78 include_dirs = [ rtc_ssl_root ] | 78 include_dirs = [ rtc_ssl_root ] |
79 } | 79 } |
80 } | 80 } |
81 | 81 |
82 # The subset of rtc_base approved for use outside of libjingle. | 82 # The subset of rtc_base approved for use outside of libjingle. |
83 rtc_static_library("rtc_base_approved") { | 83 rtc_static_library("rtc_base_approved") { |
84 # TODO(kjellander): Remove (bugs.webrtc.org/6828) | |
perkj_webrtc
2017/04/04 09:30:59
As I have understood it , rtc_base_approved should
kjellander_webrtc
2017/04/10 12:54:02
I can file a bug, but let's wait and see what tomm
kjellander_webrtc
2017/04/12 11:51:45
I filed https://bugs.chromium.org/p/webrtc/issues/
| |
85 # Enabling GN check triggers two cyclic dependency errors: | |
86 # :rtc_base_approved -> :rtc_base -> :rtc_base_approved | |
87 # :rtc_base_approved -> //webrtc/system_wrappers -> :rtc_base_approved | |
88 check_includes = false | |
84 defines = [] | 89 defines = [] |
85 libs = [] | 90 libs = [] |
86 deps = [] | 91 deps = [] |
87 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] | 92 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] |
88 | 93 |
89 sources = [ | 94 sources = [ |
90 "array_view.h", | 95 "array_view.h", |
91 "arraysize.h", | 96 "arraysize.h", |
92 "atomicops.h", | 97 "atomicops.h", |
93 "base64.cc", | 98 "base64.cc", |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 if (current_cpu == "x64") { | 273 if (current_cpu == "x64") { |
269 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-x86_64.dll" ] | 274 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-x86_64.dll" ] |
270 } else { | 275 } else { |
271 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-i386.dll" ] | 276 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-i386.dll" ] |
272 } | 277 } |
273 } | 278 } |
274 } | 279 } |
275 if (is_nacl) { | 280 if (is_nacl) { |
276 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 281 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
277 } | 282 } |
283 deps += [ "..:webrtc_common" ] | |
perkj_webrtc
2017/04/04 09:30:59
And add the todo and bug number here as well. Shou
kjellander_webrtc
2017/04/12 11:51:45
I don't see the problem with having dependencies o
| |
278 } | 284 } |
279 | 285 |
280 config("enable_libevent_config") { | 286 config("enable_libevent_config") { |
281 defines = [ "WEBRTC_BUILD_LIBEVENT" ] | 287 defines = [ "WEBRTC_BUILD_LIBEVENT" ] |
282 } | 288 } |
283 | 289 |
284 rtc_static_library("rtc_task_queue") { | 290 rtc_static_library("rtc_task_queue") { |
285 public_deps = [ | 291 public_deps = [ |
286 ":rtc_base_approved", | 292 ":rtc_base_approved", |
287 ] | 293 ] |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
650 } | 656 } |
651 } | 657 } |
652 | 658 |
653 rtc_source_set("rtc_base_tests_main") { | 659 rtc_source_set("rtc_base_tests_main") { |
654 testonly = true | 660 testonly = true |
655 sources = [ | 661 sources = [ |
656 "unittest_main.cc", | 662 "unittest_main.cc", |
657 ] | 663 ] |
658 public_configs = [ ":rtc_base_tests_utils_exported_config" ] | 664 public_configs = [ ":rtc_base_tests_utils_exported_config" ] |
659 deps = [ | 665 deps = [ |
666 ":rtc_base", | |
667 ":rtc_base_approved", | |
660 ":rtc_base_tests_utils", | 668 ":rtc_base_tests_utils", |
669 "../test:field_trial", | |
670 "../test:test_support", | |
661 ] | 671 ] |
662 public_deps = [ | 672 public_deps = [ |
663 "//testing/gmock", | 673 "//testing/gmock", |
664 "//testing/gtest", | 674 "//testing/gtest", |
665 ] | 675 ] |
666 | 676 |
667 if (!build_with_chromium && is_clang) { | 677 if (!build_with_chromium && is_clang) { |
668 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 678 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
669 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 679 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
670 } | 680 } |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
729 "nullsocketserver_unittest.cc", | 739 "nullsocketserver_unittest.cc", |
730 "physicalsocketserver_unittest.cc", | 740 "physicalsocketserver_unittest.cc", |
731 "socket_unittest.cc", | 741 "socket_unittest.cc", |
732 "socket_unittest.h", | 742 "socket_unittest.h", |
733 "socketaddress_unittest.cc", | 743 "socketaddress_unittest.cc", |
734 "virtualsocket_unittest.cc", | 744 "virtualsocket_unittest.cc", |
735 ] | 745 ] |
736 deps = [ | 746 deps = [ |
737 ":rtc_base", | 747 ":rtc_base", |
738 ":rtc_base_tests_main", | 748 ":rtc_base_tests_main", |
749 ":rtc_base_tests_utils", | |
750 "../system_wrappers:system_wrappers", | |
751 "../test:test_support", | |
739 "//testing/gtest", | 752 "//testing/gtest", |
740 ] | 753 ] |
741 if (is_win) { | 754 if (is_win) { |
742 sources += [ "win32socketserver_unittest.cc" ] | 755 sources += [ "win32socketserver_unittest.cc" ] |
743 } | 756 } |
744 | 757 |
745 if (!build_with_chromium && is_clang) { | 758 if (!build_with_chromium && is_clang) { |
746 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 759 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
747 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 760 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
748 } | 761 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
782 "safe_compare_unittest.cc", | 795 "safe_compare_unittest.cc", |
783 "stringencode_unittest.cc", | 796 "stringencode_unittest.cc", |
784 "stringutils_unittest.cc", | 797 "stringutils_unittest.cc", |
785 "swap_queue_unittest.cc", | 798 "swap_queue_unittest.cc", |
786 "thread_annotations_unittest.cc", | 799 "thread_annotations_unittest.cc", |
787 "thread_checker_unittest.cc", | 800 "thread_checker_unittest.cc", |
788 "timestampaligner_unittest.cc", | 801 "timestampaligner_unittest.cc", |
789 "timeutils_unittest.cc", | 802 "timeutils_unittest.cc", |
790 ] | 803 ] |
791 deps = [ | 804 deps = [ |
805 ":rtc_base", | |
792 ":rtc_base_approved", | 806 ":rtc_base_approved", |
793 ":rtc_base_tests_main", | 807 ":rtc_base_tests_main", |
808 ":rtc_base_tests_utils", | |
809 ":rtc_task_queue", | |
810 "../system_wrappers:system_wrappers", | |
perkj_webrtc
2017/04/04 09:30:59
system_wrappers ? Is that needed? Same todo and bu
kjellander_webrtc
2017/04/12 11:51:45
Yes it depends on system_wrappers. I'm not sure wh
| |
811 "../test:test_support", | |
794 ] | 812 ] |
795 if (!build_with_chromium && is_clang) { | 813 if (!build_with_chromium && is_clang) { |
796 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 814 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
797 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 815 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
798 } | 816 } |
799 } | 817 } |
800 | 818 |
801 rtc_source_set("rtc_task_queue_unittests") { | 819 rtc_source_set("rtc_task_queue_unittests") { |
802 testonly = true | 820 testonly = true |
803 sources = [ | 821 sources = [ |
804 "sequenced_task_checker_unittest.cc", | 822 "sequenced_task_checker_unittest.cc", |
805 "task_queue_unittest.cc", | 823 "task_queue_unittest.cc", |
806 "weak_ptr_unittest.cc", | 824 "weak_ptr_unittest.cc", |
807 ] | 825 ] |
808 deps = [ | 826 deps = [ |
809 ":rtc_base_tests_main", | 827 ":rtc_base_tests_main", |
828 ":rtc_base_tests_utils", | |
810 ":rtc_task_queue", | 829 ":rtc_task_queue", |
830 "../test:test_support", | |
811 ] | 831 ] |
812 if (!build_with_chromium && is_clang) { | 832 if (!build_with_chromium && is_clang) { |
813 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 833 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
814 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 834 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
815 } | 835 } |
816 } | 836 } |
817 | 837 |
818 rtc_source_set("rtc_numerics_unittests") { | 838 rtc_source_set("rtc_numerics_unittests") { |
819 testonly = true | 839 testonly = true |
820 sources = [ | 840 sources = [ |
821 "numerics/exp_filter_unittest.cc", | 841 "numerics/exp_filter_unittest.cc", |
822 "numerics/percentile_filter_unittest.cc", | 842 "numerics/percentile_filter_unittest.cc", |
823 ] | 843 ] |
824 deps = [ | 844 deps = [ |
845 ":rtc_base_approved", | |
825 ":rtc_base_tests_main", | 846 ":rtc_base_tests_main", |
826 ":rtc_numerics", | 847 ":rtc_numerics", |
848 "../test:test_support", | |
827 ] | 849 ] |
828 } | 850 } |
829 | 851 |
830 config("rtc_base_unittests_config") { | 852 config("rtc_base_unittests_config") { |
831 if (is_clang) { | 853 if (is_clang) { |
832 cflags = [ "-Wno-unused-const-variable" ] | 854 cflags = [ "-Wno-unused-const-variable" ] |
833 } | 855 } |
834 } | 856 } |
835 rtc_source_set("rtc_base_unittests") { | 857 rtc_source_set("rtc_base_unittests") { |
836 testonly = true | 858 testonly = true |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
876 } | 898 } |
877 if (is_posix) { | 899 if (is_posix) { |
878 sources += [ | 900 sources += [ |
879 "ssladapter_unittest.cc", | 901 "ssladapter_unittest.cc", |
880 "sslidentity_unittest.cc", | 902 "sslidentity_unittest.cc", |
881 "sslstreamadapter_unittest.cc", | 903 "sslstreamadapter_unittest.cc", |
882 ] | 904 ] |
883 } | 905 } |
884 deps = [ | 906 deps = [ |
885 ":rtc_base_tests_main", | 907 ":rtc_base_tests_main", |
908 ":rtc_base_tests_utils", | |
909 "../test:test_support", | |
886 ] | 910 ] |
887 public_deps = [ | 911 public_deps = [ |
888 ":rtc_base", | 912 ":rtc_base", |
889 ] | 913 ] |
890 configs += [ ":rtc_base_unittests_config" ] | 914 configs += [ ":rtc_base_unittests_config" ] |
891 if (!build_with_chromium && is_clang) { | 915 if (!build_with_chromium && is_clang) { |
892 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 916 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
893 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 917 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
894 } | 918 } |
895 } | 919 } |
896 } | 920 } |
897 | 921 |
898 if (is_android) { | 922 if (is_android) { |
899 android_library("base_java") { | 923 android_library("base_java") { |
900 java_files = [ | 924 java_files = [ |
901 "java/src/org/webrtc/Logging.java", | 925 "java/src/org/webrtc/Logging.java", |
902 "java/src/org/webrtc/Size.java", | 926 "java/src/org/webrtc/Size.java", |
903 "java/src/org/webrtc/ThreadUtils.java", | 927 "java/src/org/webrtc/ThreadUtils.java", |
904 ] | 928 ] |
905 } | 929 } |
906 } | 930 } |
OLD | NEW |