Index: webrtc/base/BUILD.gn |
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn |
index 7e02a3a063a7b704e622fedfe1e6b7f0f5c1f081..ba8ac4ead615e3e3bfeabbfc02837bc4294fc328 100644 |
--- a/webrtc/base/BUILD.gn |
+++ b/webrtc/base/BUILD.gn |
@@ -81,6 +81,11 @@ if (!rtc_build_ssl) { |
# The subset of rtc_base approved for use outside of libjingle. |
rtc_static_library("rtc_base_approved") { |
+ # 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/
|
+ # Enabling GN check triggers two cyclic dependency errors: |
+ # :rtc_base_approved -> :rtc_base -> :rtc_base_approved |
+ # :rtc_base_approved -> //webrtc/system_wrappers -> :rtc_base_approved |
+ check_includes = false |
defines = [] |
libs = [] |
deps = [] |
@@ -275,6 +280,7 @@ rtc_static_library("rtc_base_approved") { |
if (is_nacl) { |
deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
} |
+ 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
|
} |
config("enable_libevent_config") { |
@@ -657,7 +663,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", |
@@ -736,6 +746,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) { |
@@ -789,8 +802,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", |
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
|
+ "../test:test_support", |
] |
if (!build_with_chromium && is_clang) { |
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
@@ -807,7 +825,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). |
@@ -822,8 +842,10 @@ if (rtc_include_tests) { |
"numerics/percentile_filter_unittest.cc", |
] |
deps = [ |
+ ":rtc_base_approved", |
":rtc_base_tests_main", |
":rtc_numerics", |
+ "../test:test_support", |
] |
} |
@@ -883,6 +905,8 @@ if (rtc_include_tests) { |
} |
deps = [ |
":rtc_base_tests_main", |
+ ":rtc_base_tests_utils", |
+ "../test:test_support", |
] |
public_deps = [ |
":rtc_base", |