Skip to content

Commit 8e5014a

Browse files
MirkoBonadeiCommit Bot
authored and
Commit Bot
committed
Remove definition and usage of macro GTEST_RELATIVE_PATH.
The macro GTEST_RELATIVE_PATH is obsolete and since it is always defined this CL just removes it. Bug: webrtc:9564 Change-Id: Ieafa5b77351c4df87864588ba6b3de8f60d54e89 Reviewed-on: https://webrtc-review.googlesource.com/92080 Reviewed-by: Oleh Prypin <[email protected]> Reviewed-by: Karl Wiberg <[email protected]> Commit-Queue: Mirko Bonadei <[email protected]> Cr-Commit-Position: refs/heads/master@{#24226}
1 parent c234203 commit 8e5014a

File tree

7 files changed

+3
-26
lines changed

7 files changed

+3
-26
lines changed

BUILD.gn

+1-6
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,7 @@ config("common_inherited_config") {
104104
defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ]
105105
}
106106
if (build_with_chromium) {
107-
defines += [
108-
# TODO(kjellander): Cleanup unused ones and move defines closer to
109-
# the source when webrtc:4256 is completed.
110-
"GTEST_RELATIVE_PATH",
111-
"WEBRTC_CHROMIUM_BUILD",
112-
]
107+
defines += [ "WEBRTC_CHROMIUM_BUILD" ]
113108
include_dirs = [
114109
# The overrides must be included first as that is the mechanism for
115110
# selecting the override headers in Chromium.

p2p/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ if (rtc_include_tests) {
186186
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
187187
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
188188
}
189-
defines = [ "GTEST_RELATIVE_PATH" ]
190189
}
191190
}
192191

@@ -221,6 +220,5 @@ if (rtc_include_tests) {
221220
"../rtc_base:rtc_base_tests_utils",
222221
"//testing/gtest",
223222
]
224-
defines = [ "GTEST_RELATIVE_PATH" ]
225223
}
226224
}

rtc_base/BUILD.gn

-6
Original file line numberDiff line numberDiff line change
@@ -963,10 +963,6 @@ rtc_source_set("gtest_prod") {
963963
]
964964
}
965965

966-
config("rtc_base_tests_utils_exported_config") {
967-
defines = [ "GTEST_RELATIVE_PATH" ]
968-
}
969-
970966
rtc_source_set("rtc_base_tests_utils") {
971967
testonly = true
972968
sources = [
@@ -1010,7 +1006,6 @@ rtc_source_set("rtc_base_tests_utils") {
10101006
"virtualsocketserver.cc",
10111007
"virtualsocketserver.h",
10121008
]
1013-
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
10141009
deps = [
10151010
":checks",
10161011
":rtc_base",
@@ -1060,7 +1055,6 @@ if (rtc_include_tests) {
10601055
sources = [
10611056
"unittest_main.cc",
10621057
]
1063-
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
10641058
deps = [
10651059
":rtc_base",
10661060
":rtc_base_approved",

rtc_base/gunit.h

-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
#include "rtc_base/fakeclock.h"
1515
#include "rtc_base/logging.h"
1616
#include "rtc_base/thread.h"
17-
#if defined(GTEST_RELATIVE_PATH)
1817
#include "test/gtest.h"
19-
#else
20-
#include "testing/base/public/gunit.h"
21-
#endif
2218

2319
// Wait until "ex" is true, or "timeout" expires.
2420
#define WAIT(ex, timeout) \

rtc_base/gunit_prod.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
// Android doesn't use gtest at all, so anything that relies on gtest should
1616
// check this define first.
1717
#define NO_GTEST
18-
#elif defined(GTEST_RELATIVE_PATH)
19-
#include "gtest/gtest_prod.h"
2018
#else
21-
#include "testing/base/gunit_prod.h"
19+
#include "gtest/gtest_prod.h"
2220
#endif
2321

2422
#endif // RTC_BASE_GUNIT_PROD_H_

rtc_tools/network_tester/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ if (rtc_enable_protobuf) {
9090
deps += [ ":network_tester_unittests_bundle_data" ]
9191
}
9292

93-
defines = [
94-
"GTEST_RELATIVE_PATH",
95-
"WEBRTC_NETWORK_TESTER_TEST_ENABLED",
96-
]
93+
defines = [ "WEBRTC_NETWORK_TESTER_TEST_ENABLED" ]
9794

9895
data = network_tester_unittests_resources
9996

sdk/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,6 @@ if (is_ios || is_mac) {
890890
# https://developer.apple.com/library/mac/qa/qa1490/_index.html
891891
ldflags = [ "-ObjC" ]
892892

893-
defines = [ "GTEST_RELATIVE_PATH" ]
894893
deps = [
895894
":common_objc",
896895
":mediaconstraints_objc",

0 commit comments

Comments
 (0)