| Index: webrtc/base/BUILD.gn
|
| diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
|
| index 6280903b58fa370bfc81501eeeea24fe734c0971..61d9061bea4d3ee14bb2183c075745921a9b0ce4 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",
|
| @@ -670,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",
|
| @@ -699,6 +706,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 +758,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 +807,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 +816,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 +839,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 +856,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 +919,8 @@ if (rtc_include_tests) {
|
| }
|
| deps = [
|
| ":rtc_base_tests_main",
|
| + ":rtc_base_tests_utils",
|
| + "../test:test_support",
|
| ]
|
| public_deps = [
|
| ":rtc_base",
|
|
|