Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: webrtc/base/BUILD.gn

Issue 2717083002: Enable GN check for webrtc/base (Closed)
Patch Set: Restore .gn change again Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « .gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index d81720652ce6b6db9d915ffc192a6203ff2d70b7..71d8c529b7b5e5fe0de86da8373681b3712a90e0 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)
+ # Enabling GN check triggers two cyclic dependency errors:
+ # :rtc_base_approved -> :rtc_base -> :rtc_base_approved
tommi 2017/03/31 08:38:29 where is the dependency from base_approved to base
kjellander_webrtc 2017/04/04 04:23:09 ERROR at //webrtc/base/md5digest.h:15:11: Include
tommi 2017/04/04 09:53:14 md5digest.h should not be in rtc_base_approved. I
kjellander_webrtc 2017/04/10 12:54:02 You're right that it's only used for audio tests.
+ # :rtc_base_approved -> //webrtc/system_wrappers -> :rtc_base_approved
+ check_includes = false
defines = []
libs = []
deps = []
@@ -271,6 +276,7 @@ rtc_static_library("rtc_base_approved") {
}
}
}
+ deps += [ "..:webrtc_common" ]
tommi 2017/03/08 13:36:45 base_approved shouldn't have any dependencies like
kjellander_webrtc 2017/03/08 13:56:04 Well, what I'm doing here is just adding what is a
tommi 2017/03/31 08:38:29 Ack. Is there information about this in the bug? (
kjellander_webrtc 2017/04/04 04:23:09 The referenced bug only deals with the enabling of
}
config("enable_libevent_config") {
@@ -359,6 +365,10 @@ rtc_static_library("rtc_task_runner") {
"taskrunner.cc",
"taskrunner.h",
]
+ deps = [
+ ":rtc_base",
+ ":rtc_base_approved",
+ ]
}
rtc_static_library("rtc_base") {
@@ -663,7 +673,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",
@@ -740,6 +754,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) {
@@ -793,8 +810,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).
@@ -811,7 +833,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).
@@ -826,8 +850,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 +909,7 @@ if (rtc_include_tests) {
}
deps = [
":rtc_base_tests_main",
+ ":rtc_base_tests_utils",
":rtc_task_runner",
]
public_deps = [
« no previous file with comments | « .gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698