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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
85 ] | 85 ] |
86 if (rtc_enable_protobuf) { | 86 if (rtc_enable_protobuf) { |
87 public_deps = [ | 87 public_deps = [ |
88 "//third_party/protobuf:protobuf_lite", | 88 "//third_party/protobuf:protobuf_lite", |
89 ] | 89 ] |
90 } | 90 } |
91 } | 91 } |
92 | 92 |
93 # The subset of rtc_base approved for use outside of libjingle. | 93 # The subset of rtc_base approved for use outside of libjingle. |
94 rtc_static_library("rtc_base_approved") { | 94 rtc_static_library("rtc_base_approved") { |
95 # TODO(kjellander): Remove (bugs.webrtc.org/7480) | |
96 # Enabling GN check triggers a cyclic dependency caused by rate_limiter.cc: | |
97 # :rtc_base_approved -> //webrtc/system_wrappers -> :rtc_base_approved | |
98 check_includes = false | |
95 defines = [] | 99 defines = [] |
96 libs = [] | 100 libs = [] |
97 deps = [] | 101 deps = [] |
98 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] | 102 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] |
99 | 103 |
100 sources = [ | 104 sources = [ |
101 "array_view.h", | 105 "array_view.h", |
102 "arraysize.h", | 106 "arraysize.h", |
103 "atomicops.h", | 107 "atomicops.h", |
104 "base64.cc", | 108 "base64.cc", |
(...skipping 24 matching lines...) Expand all Loading... | |
129 "file.h", | 133 "file.h", |
130 "flags.cc", | 134 "flags.cc", |
131 "flags.h", | 135 "flags.h", |
132 "format_macros.h", | 136 "format_macros.h", |
133 "function_view.h", | 137 "function_view.h", |
134 "ignore_wundef.h", | 138 "ignore_wundef.h", |
135 "location.cc", | 139 "location.cc", |
136 "location.h", | 140 "location.h", |
137 "md5.cc", | 141 "md5.cc", |
138 "md5.h", | 142 "md5.h", |
139 "md5digest.cc", | |
140 "md5digest.h", | |
141 "mod_ops.h", | 143 "mod_ops.h", |
142 "onetimeevent.h", | 144 "onetimeevent.h", |
143 "optional.cc", | 145 "optional.cc", |
144 "optional.h", | 146 "optional.h", |
145 "pathutils.cc", | 147 "pathutils.cc", |
146 "pathutils.h", | 148 "pathutils.h", |
147 "platform_file.cc", | 149 "platform_file.cc", |
148 "platform_file.h", | 150 "platform_file.h", |
149 "platform_thread.cc", | 151 "platform_thread.cc", |
150 "platform_thread.h", | 152 "platform_thread.h", |
(...skipping 13 matching lines...) Expand all Loading... | |
164 "refcountedobject.h", | 166 "refcountedobject.h", |
165 "safe_compare.h", | 167 "safe_compare.h", |
166 "safe_conversions.h", | 168 "safe_conversions.h", |
167 "safe_conversions_impl.h", | 169 "safe_conversions_impl.h", |
168 "sanitizer.h", | 170 "sanitizer.h", |
169 "scoped_ref_ptr.h", | 171 "scoped_ref_ptr.h", |
170 "string_to_number.cc", | 172 "string_to_number.cc", |
171 "string_to_number.h", | 173 "string_to_number.h", |
172 "stringencode.cc", | 174 "stringencode.cc", |
173 "stringencode.h", | 175 "stringencode.h", |
176 "stringize_macros.h", | |
174 "stringutils.cc", | 177 "stringutils.cc", |
175 "stringutils.h", | 178 "stringutils.h", |
176 "swap_queue.h", | 179 "swap_queue.h", |
177 "template_util.h", | 180 "template_util.h", |
178 "thread_annotations.h", | 181 "thread_annotations.h", |
179 "thread_checker.h", | 182 "thread_checker.h", |
180 "thread_checker_impl.cc", | 183 "thread_checker_impl.cc", |
181 "thread_checker_impl.h", | 184 "thread_checker_impl.h", |
182 "timestampaligner.cc", | 185 "timestampaligner.cc", |
183 "timestampaligner.h", | 186 "timestampaligner.h", |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
281 if (current_cpu == "x64") { | 284 if (current_cpu == "x64") { |
282 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-x86_64.dll" ] | 285 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-x86_64.dll" ] |
283 } else { | 286 } else { |
284 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-i386.dll" ] | 287 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-i386.dll" ] |
285 } | 288 } |
286 } | 289 } |
287 } | 290 } |
288 if (is_nacl) { | 291 if (is_nacl) { |
289 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 292 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
290 } | 293 } |
294 deps += [ "..:webrtc_common" ] | |
kjellander_webrtc
2017/04/19 10:58:47
This is needed by the following files that include
tommi
2017/04/19 13:45:01
do we still need this even with checks disabled?
tommi
2017/04/19 13:45:01
Could we instead move typedefs.h to rtc_base_appro
kjellander_webrtc
2017/04/19 13:57:51
No we can just remove it. I just wanted to add wha
kjellander_webrtc
2017/04/19 13:57:51
We could, but that's a massive amount of work cons
| |
291 } | 295 } |
292 | 296 |
293 config("enable_libevent_config") { | 297 config("enable_libevent_config") { |
294 defines = [ "WEBRTC_BUILD_LIBEVENT" ] | 298 defines = [ "WEBRTC_BUILD_LIBEVENT" ] |
295 } | 299 } |
296 | 300 |
297 rtc_static_library("rtc_task_queue") { | 301 rtc_static_library("rtc_task_queue") { |
298 public_deps = [ | 302 public_deps = [ |
299 ":rtc_base_approved", | 303 ":rtc_base_approved", |
300 ] | 304 ] |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
663 } | 667 } |
664 } | 668 } |
665 | 669 |
666 rtc_source_set("rtc_base_tests_main") { | 670 rtc_source_set("rtc_base_tests_main") { |
667 testonly = true | 671 testonly = true |
668 sources = [ | 672 sources = [ |
669 "unittest_main.cc", | 673 "unittest_main.cc", |
670 ] | 674 ] |
671 public_configs = [ ":rtc_base_tests_utils_exported_config" ] | 675 public_configs = [ ":rtc_base_tests_utils_exported_config" ] |
672 deps = [ | 676 deps = [ |
677 ":rtc_base", | |
678 ":rtc_base_approved", | |
673 ":rtc_base_tests_utils", | 679 ":rtc_base_tests_utils", |
680 "../test:field_trial", | |
681 "../test:test_support", | |
674 ] | 682 ] |
675 public_deps = [ | 683 public_deps = [ |
676 "//testing/gmock", | 684 "//testing/gmock", |
677 "//testing/gtest", | 685 "//testing/gtest", |
678 ] | 686 ] |
679 | 687 |
680 if (!build_with_chromium && is_clang) { | 688 if (!build_with_chromium && is_clang) { |
681 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 689 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
682 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 690 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
683 } | 691 } |
684 } | 692 } |
685 | 693 |
686 rtc_source_set("rtc_base_tests_utils") { | 694 rtc_source_set("rtc_base_tests_utils") { |
687 testonly = true | 695 testonly = true |
688 sources = [ | 696 sources = [ |
689 # Also use this as a convenient dumping ground for misc files that are | 697 # Also use this as a convenient dumping ground for misc files that are |
690 # included by multiple targets below. | 698 # included by multiple targets below. |
691 "cpu_time.cc", | 699 "cpu_time.cc", |
692 "cpu_time.h", | 700 "cpu_time.h", |
693 "fakeclock.cc", | 701 "fakeclock.cc", |
694 "fakeclock.h", | 702 "fakeclock.h", |
695 "fakenetwork.h", | 703 "fakenetwork.h", |
696 "fakesslidentity.h", | 704 "fakesslidentity.h", |
697 "firewallsocketserver.cc", | 705 "firewallsocketserver.cc", |
698 "firewallsocketserver.h", | 706 "firewallsocketserver.h", |
699 "gunit.h", | 707 "gunit.h", |
700 "httpserver.cc", | 708 "httpserver.cc", |
701 "httpserver.h", | 709 "httpserver.h", |
710 "md5digest.cc", | |
711 "md5digest.h", | |
702 "memory_usage.cc", | 712 "memory_usage.cc", |
703 "memory_usage.h", | 713 "memory_usage.h", |
704 "natserver.cc", | 714 "natserver.cc", |
705 "natserver.h", | 715 "natserver.h", |
706 "natsocketfactory.cc", | 716 "natsocketfactory.cc", |
707 "natsocketfactory.h", | 717 "natsocketfactory.h", |
708 "nattypes.cc", | 718 "nattypes.cc", |
709 "nattypes.h", | 719 "nattypes.h", |
710 "proxyserver.cc", | 720 "proxyserver.cc", |
711 "proxyserver.h", | 721 "proxyserver.h", |
(...skipping 30 matching lines...) Expand all Loading... | |
742 "nullsocketserver_unittest.cc", | 752 "nullsocketserver_unittest.cc", |
743 "physicalsocketserver_unittest.cc", | 753 "physicalsocketserver_unittest.cc", |
744 "socket_unittest.cc", | 754 "socket_unittest.cc", |
745 "socket_unittest.h", | 755 "socket_unittest.h", |
746 "socketaddress_unittest.cc", | 756 "socketaddress_unittest.cc", |
747 "virtualsocket_unittest.cc", | 757 "virtualsocket_unittest.cc", |
748 ] | 758 ] |
749 deps = [ | 759 deps = [ |
750 ":rtc_base", | 760 ":rtc_base", |
751 ":rtc_base_tests_main", | 761 ":rtc_base_tests_main", |
762 ":rtc_base_tests_utils", | |
763 "../system_wrappers:system_wrappers", | |
764 "../test:test_support", | |
752 "//testing/gtest", | 765 "//testing/gtest", |
753 ] | 766 ] |
754 if (is_win) { | 767 if (is_win) { |
755 sources += [ "win32socketserver_unittest.cc" ] | 768 sources += [ "win32socketserver_unittest.cc" ] |
756 } | 769 } |
757 | 770 |
758 if (!build_with_chromium && is_clang) { | 771 if (!build_with_chromium && is_clang) { |
759 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 772 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
760 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 773 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
761 } | 774 } |
(...skipping 26 matching lines...) Expand all Loading... | |
788 "pathutils_unittest.cc", | 801 "pathutils_unittest.cc", |
789 "platform_thread_unittest.cc", | 802 "platform_thread_unittest.cc", |
790 "random_unittest.cc", | 803 "random_unittest.cc", |
791 "rate_limiter_unittest.cc", | 804 "rate_limiter_unittest.cc", |
792 "rate_statistics_unittest.cc", | 805 "rate_statistics_unittest.cc", |
793 "ratetracker_unittest.cc", | 806 "ratetracker_unittest.cc", |
794 "refcountedobject_unittest.cc", | 807 "refcountedobject_unittest.cc", |
795 "safe_compare_unittest.cc", | 808 "safe_compare_unittest.cc", |
796 "string_to_number_unittest.cc", | 809 "string_to_number_unittest.cc", |
797 "stringencode_unittest.cc", | 810 "stringencode_unittest.cc", |
811 "stringize_macros_unittest.cc", | |
798 "stringutils_unittest.cc", | 812 "stringutils_unittest.cc", |
799 "swap_queue_unittest.cc", | 813 "swap_queue_unittest.cc", |
800 "thread_annotations_unittest.cc", | 814 "thread_annotations_unittest.cc", |
801 "thread_checker_unittest.cc", | 815 "thread_checker_unittest.cc", |
802 "timestampaligner_unittest.cc", | 816 "timestampaligner_unittest.cc", |
803 "timeutils_unittest.cc", | 817 "timeutils_unittest.cc", |
804 ] | 818 ] |
805 deps = [ | 819 deps = [ |
820 ":rtc_base", | |
806 ":rtc_base_approved", | 821 ":rtc_base_approved", |
807 ":rtc_base_tests_main", | 822 ":rtc_base_tests_main", |
823 ":rtc_base_tests_utils", | |
824 ":rtc_task_queue", | |
825 "../system_wrappers:system_wrappers", | |
826 "../test:test_support", | |
808 ] | 827 ] |
809 if (!build_with_chromium && is_clang) { | 828 if (!build_with_chromium && is_clang) { |
810 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 829 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
811 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 830 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
812 } | 831 } |
813 } | 832 } |
814 | 833 |
815 rtc_source_set("rtc_task_queue_unittests") { | 834 rtc_source_set("rtc_task_queue_unittests") { |
816 testonly = true | 835 testonly = true |
817 sources = [ | 836 sources = [ |
818 "sequenced_task_checker_unittest.cc", | 837 "sequenced_task_checker_unittest.cc", |
819 "task_queue_unittest.cc", | 838 "task_queue_unittest.cc", |
820 "weak_ptr_unittest.cc", | 839 "weak_ptr_unittest.cc", |
821 ] | 840 ] |
822 deps = [ | 841 deps = [ |
823 ":rtc_base_tests_main", | 842 ":rtc_base_tests_main", |
843 ":rtc_base_tests_utils", | |
824 ":rtc_task_queue", | 844 ":rtc_task_queue", |
845 "../test:test_support", | |
825 ] | 846 ] |
826 if (!build_with_chromium && is_clang) { | 847 if (!build_with_chromium && is_clang) { |
827 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 848 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
828 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 849 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
829 } | 850 } |
830 } | 851 } |
831 | 852 |
832 rtc_source_set("rtc_numerics_unittests") { | 853 rtc_source_set("rtc_numerics_unittests") { |
833 testonly = true | 854 testonly = true |
834 sources = [ | 855 sources = [ |
835 "numerics/exp_filter_unittest.cc", | 856 "numerics/exp_filter_unittest.cc", |
836 "numerics/percentile_filter_unittest.cc", | 857 "numerics/percentile_filter_unittest.cc", |
837 ] | 858 ] |
838 deps = [ | 859 deps = [ |
860 ":rtc_base_approved", | |
839 ":rtc_base_tests_main", | 861 ":rtc_base_tests_main", |
840 ":rtc_numerics", | 862 ":rtc_numerics", |
863 "../test:test_support", | |
841 ] | 864 ] |
842 } | 865 } |
843 | 866 |
844 config("rtc_base_unittests_config") { | 867 config("rtc_base_unittests_config") { |
845 if (is_clang) { | 868 if (is_clang) { |
846 cflags = [ "-Wno-unused-const-variable" ] | 869 cflags = [ "-Wno-unused-const-variable" ] |
847 } | 870 } |
848 } | 871 } |
849 rtc_source_set("rtc_base_unittests") { | 872 rtc_source_set("rtc_base_unittests") { |
850 testonly = true | 873 testonly = true |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
890 } | 913 } |
891 if (is_posix) { | 914 if (is_posix) { |
892 sources += [ | 915 sources += [ |
893 "ssladapter_unittest.cc", | 916 "ssladapter_unittest.cc", |
894 "sslidentity_unittest.cc", | 917 "sslidentity_unittest.cc", |
895 "sslstreamadapter_unittest.cc", | 918 "sslstreamadapter_unittest.cc", |
896 ] | 919 ] |
897 } | 920 } |
898 deps = [ | 921 deps = [ |
899 ":rtc_base_tests_main", | 922 ":rtc_base_tests_main", |
923 ":rtc_base_tests_utils", | |
924 "../test:test_support", | |
900 ] | 925 ] |
901 public_deps = [ | 926 public_deps = [ |
902 ":rtc_base", | 927 ":rtc_base", |
903 ] | 928 ] |
904 configs += [ ":rtc_base_unittests_config" ] | 929 configs += [ ":rtc_base_unittests_config" ] |
905 if (!build_with_chromium && is_clang) { | 930 if (!build_with_chromium && is_clang) { |
906 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 931 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
907 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 932 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
908 } | 933 } |
909 } | 934 } |
910 } | 935 } |
911 | 936 |
912 if (is_android) { | 937 if (is_android) { |
913 android_library("base_java") { | 938 android_library("base_java") { |
914 java_files = [ | 939 java_files = [ |
915 "java/src/org/webrtc/Logging.java", | 940 "java/src/org/webrtc/Logging.java", |
916 "java/src/org/webrtc/Size.java", | 941 "java/src/org/webrtc/Size.java", |
917 "java/src/org/webrtc/ThreadUtils.java", | 942 "java/src/org/webrtc/ThreadUtils.java", |
918 ] | 943 ] |
919 } | 944 } |
920 } | 945 } |
OLD | NEW |