Index: webrtc/base/BUILD.gn |
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn |
index 6280903b58fa370bfc81501eeeea24fe734c0971..95575465d36550df6e40d5349637431ff3e3ec0e 100644 |
--- a/webrtc/base/BUILD.gn |
+++ b/webrtc/base/BUILD.gn |
@@ -92,6 +92,10 @@ source_set("protobuf_utils") { |
# The subset of rtc_base approved for use outside of libjingle. |
rtc_static_library("rtc_base_approved") { |
+ # TODO(kjellander): Remove (bugs.webrtc.org/7480) |
+ # Enabling GN check triggers a cyclic dependency caused by rate_limiter.cc: |
+ # :rtc_base_approved -> //webrtc/system_wrappers -> :rtc_base_approved |
+ check_includes = false |
defines = [] |
libs = [] |
deps = [] |
@@ -136,8 +140,6 @@ rtc_static_library("rtc_base_approved") { |
"location.h", |
"md5.cc", |
"md5.h", |
- "md5digest.cc", |
- "md5digest.h", |
"mod_ops.h", |
"onetimeevent.h", |
"optional.cc", |
@@ -171,6 +173,7 @@ rtc_static_library("rtc_base_approved") { |
"string_to_number.h", |
"stringencode.cc", |
"stringencode.h", |
+ "stringize_macros.h", |
"stringutils.cc", |
"stringutils.h", |
"swap_queue.h", |
@@ -288,6 +291,7 @@ rtc_static_library("rtc_base_approved") { |
if (is_nacl) { |
deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
} |
+ 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
|
} |
config("enable_libevent_config") { |
@@ -670,7 +674,11 @@ if (rtc_include_tests) { |
] |
public_configs = [ ":rtc_base_tests_utils_exported_config" ] |
deps = [ |
+ ":rtc_base", |
+ ":rtc_base_approved", |
":rtc_base_tests_utils", |
+ "../test:field_trial", |
+ "../test:test_support", |
] |
public_deps = [ |
"//testing/gmock", |
@@ -699,6 +707,8 @@ if (rtc_include_tests) { |
"gunit.h", |
"httpserver.cc", |
"httpserver.h", |
+ "md5digest.cc", |
+ "md5digest.h", |
"memory_usage.cc", |
"memory_usage.h", |
"natserver.cc", |
@@ -749,6 +759,9 @@ if (rtc_include_tests) { |
deps = [ |
":rtc_base", |
":rtc_base_tests_main", |
+ ":rtc_base_tests_utils", |
+ "../system_wrappers:system_wrappers", |
+ "../test:test_support", |
"//testing/gtest", |
] |
if (is_win) { |
@@ -795,6 +808,7 @@ if (rtc_include_tests) { |
"safe_compare_unittest.cc", |
"string_to_number_unittest.cc", |
"stringencode_unittest.cc", |
+ "stringize_macros_unittest.cc", |
"stringutils_unittest.cc", |
"swap_queue_unittest.cc", |
"thread_annotations_unittest.cc", |
@@ -803,8 +817,13 @@ if (rtc_include_tests) { |
"timeutils_unittest.cc", |
] |
deps = [ |
+ ":rtc_base", |
":rtc_base_approved", |
":rtc_base_tests_main", |
+ ":rtc_base_tests_utils", |
+ ":rtc_task_queue", |
+ "../system_wrappers:system_wrappers", |
+ "../test:test_support", |
] |
if (!build_with_chromium && is_clang) { |
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
@@ -821,7 +840,9 @@ if (rtc_include_tests) { |
] |
deps = [ |
":rtc_base_tests_main", |
+ ":rtc_base_tests_utils", |
":rtc_task_queue", |
+ "../test:test_support", |
] |
if (!build_with_chromium && is_clang) { |
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
@@ -836,8 +857,10 @@ if (rtc_include_tests) { |
"numerics/percentile_filter_unittest.cc", |
] |
deps = [ |
+ ":rtc_base_approved", |
":rtc_base_tests_main", |
":rtc_numerics", |
+ "../test:test_support", |
] |
} |
@@ -897,6 +920,8 @@ if (rtc_include_tests) { |
} |
deps = [ |
":rtc_base_tests_main", |
+ ":rtc_base_tests_utils", |
+ "../test:test_support", |
] |
public_deps = [ |
":rtc_base", |