aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gn1
-rw-r--r--webrtc/base/BUILD.gn28
-rw-r--r--webrtc/base/location.h2
-rw-r--r--webrtc/base/pathutils.cc1
-rw-r--r--webrtc/common_audio/resampler/sinc_resampler_unittest.cc2
-rw-r--r--webrtc/modules/audio_coding/BUILD.gn1
-rw-r--r--webrtc/system_wrappers/BUILD.gn2
-rw-r--r--webrtc/system_wrappers/include/stringize_macros.h (renamed from webrtc/base/stringize_macros.h)6
-rw-r--r--webrtc/system_wrappers/source/stringize_macros_unittest.cc (renamed from webrtc/base/stringize_macros_unittest.cc)2
-rw-r--r--webrtc/test/fuzzers/BUILD.gn1
-rw-r--r--webrtc/voice_engine/BUILD.gn1
11 files changed, 11 insertions, 36 deletions
diff --git a/.gn b/.gn
index 585ff30842..f8a113af18 100644
--- a/.gn
+++ b/.gn
@@ -24,7 +24,6 @@ secondary_source = "//build/secondary/"
check_targets = [
"//webrtc/api/*",
"//webrtc/audio/*",
- "//webrtc/base/*",
"//webrtc/call/*",
"//webrtc/common_video/*",
"//webrtc/common_audio/*",
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 9e5bdc671b..2a990e8ec2 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -92,10 +92,6 @@ 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 = []
@@ -140,6 +136,8 @@ rtc_static_library("rtc_base_approved") {
"location.h",
"md5.cc",
"md5.h",
+ "md5digest.cc",
+ "md5digest.h",
"mod_ops.h",
"onetimeevent.h",
"optional.cc",
@@ -173,7 +171,6 @@ rtc_static_library("rtc_base_approved") {
"string_to_number.h",
"stringencode.cc",
"stringencode.h",
- "stringize_macros.h",
"stringutils.cc",
"stringutils.h",
"swap_queue.h",
@@ -679,11 +676,7 @@ 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",
@@ -712,8 +705,6 @@ if (rtc_include_tests) {
"gunit.h",
"httpserver.cc",
"httpserver.h",
- "md5digest.cc",
- "md5digest.h",
"memory_usage.cc",
"memory_usage.h",
"natserver.cc",
@@ -764,9 +755,6 @@ 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) {
@@ -813,7 +801,6 @@ 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",
@@ -822,13 +809,8 @@ 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).
@@ -845,9 +827,7 @@ 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).
@@ -862,10 +842,8 @@ if (rtc_include_tests) {
"numerics/percentile_filter_unittest.cc",
]
deps = [
- ":rtc_base_approved",
":rtc_base_tests_main",
":rtc_numerics",
- "../test:test_support",
]
}
@@ -924,8 +902,6 @@ if (rtc_include_tests) {
}
deps = [
":rtc_base_tests_main",
- ":rtc_base_tests_utils",
- "../test:test_support",
]
public_deps = [
":rtc_base",
diff --git a/webrtc/base/location.h b/webrtc/base/location.h
index 541be9ac14..a541bbef51 100644
--- a/webrtc/base/location.h
+++ b/webrtc/base/location.h
@@ -13,7 +13,7 @@
#include <string>
-#include "webrtc/base/stringize_macros.h"
+#include "webrtc/system_wrappers/include/stringize_macros.h"
namespace rtc {
diff --git a/webrtc/base/pathutils.cc b/webrtc/base/pathutils.cc
index 30367743bf..75dabb53e4 100644
--- a/webrtc/base/pathutils.cc
+++ b/webrtc/base/pathutils.cc
@@ -16,6 +16,7 @@
#endif // WEBRTC_WIN
#include "webrtc/base/checks.h"
+#include "webrtc/base/fileutils.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/pathutils.h"
#include "webrtc/base/stringutils.h"
diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
index 990580dd2d..82546d0360 100644
--- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
@@ -19,11 +19,11 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/stringize_macros.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_audio/resampler/sinc_resampler.h"
#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "webrtc/system_wrappers/include/stringize_macros.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 9bdd1fc315..9c7e5eec55 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -1577,7 +1577,6 @@ if (rtc_include_tests) {
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../base:rtc_base_approved",
- "../../base:rtc_base_tests_utils",
"../../common_audio",
"../../test:rtp_test_utils",
"../rtp_rtcp",
diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn
index 325c0166a0..6a056c2d9c 100644
--- a/webrtc/system_wrappers/BUILD.gn
+++ b/webrtc/system_wrappers/BUILD.gn
@@ -27,6 +27,7 @@ rtc_static_library("system_wrappers") {
"include/rw_lock_wrapper.h",
"include/sleep.h",
"include/static_instance.h",
+ "include/stringize_macros.h",
"include/timestamp_extrapolator.h",
"include/trace.h",
"source/aligned_malloc.cc",
@@ -210,6 +211,7 @@ if (rtc_include_tests) {
"source/metrics_unittest.cc",
"source/ntp_time_unittest.cc",
"source/rtp_to_ntp_estimator_unittest.cc",
+ "source/stringize_macros_unittest.cc",
]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
diff --git a/webrtc/base/stringize_macros.h b/webrtc/system_wrappers/include/stringize_macros.h
index 7e2f44da8a..9c8e7e9120 100644
--- a/webrtc/base/stringize_macros.h
+++ b/webrtc/system_wrappers/include/stringize_macros.h
@@ -15,8 +15,8 @@
// symbols (or their output) and manipulating preprocessor symbols
// that define strings.
-#ifndef WEBRTC_BASE_STRINGIZE_MACROS_H_
-#define WEBRTC_BASE_STRINGIZE_MACROS_H_
+#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_STRINGIZE_MACROS_H_
+#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_STRINGIZE_MACROS_H_
// This is not very useful as it does not expand defined symbols if
// called directly. Use its counterpart without the _NO_EXPANSION
@@ -35,4 +35,4 @@
// STRINGIZE(B(y)) produces "myobj->FunctionCall(y)"
#define STRINGIZE(x) STRINGIZE_NO_EXPANSION(x)
-#endif // WEBRTC_BASE_STRINGIZE_MACROS_H_
+#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_STRINGIZE_MACROS_H_
diff --git a/webrtc/base/stringize_macros_unittest.cc b/webrtc/system_wrappers/source/stringize_macros_unittest.cc
index d0ba113d4d..8b103c5d39 100644
--- a/webrtc/base/stringize_macros_unittest.cc
+++ b/webrtc/system_wrappers/source/stringize_macros_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/stringize_macros.h"
+#include "webrtc/system_wrappers/include/stringize_macros.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/test/fuzzers/BUILD.gn b/webrtc/test/fuzzers/BUILD.gn
index c184452f45..ed84e48833 100644
--- a/webrtc/test/fuzzers/BUILD.gn
+++ b/webrtc/test/fuzzers/BUILD.gn
@@ -276,7 +276,6 @@ webrtc_fuzzer_test("neteq_rtp_fuzzer") {
]
deps = [
"../../base:rtc_base_approved",
- "../../base:rtc_base_tests_utils",
"../../modules/audio_coding:neteq",
"../../modules/audio_coding:neteq_test_minimal",
"../../modules/audio_coding:neteq_unittest_tools",
diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn
index 40d9ed3bd8..ca774f2800 100644
--- a/webrtc/voice_engine/BUILD.gn
+++ b/webrtc/voice_engine/BUILD.gn
@@ -181,7 +181,6 @@ if (rtc_include_tests) {
":file_player",
":voice_engine",
"../base:rtc_base_approved",
- "../base:rtc_base_tests_utils",
"../test:test_common",
"//testing/gmock",
"//testing/gtest",
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 08:22:50 +0000