File tree 7 files changed +3
-26
lines changed
7 files changed +3
-26
lines changed Original file line number Diff line number Diff line change @@ -104,12 +104,7 @@ config("common_inherited_config") {
104
104
defines += [ " WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ]
105
105
}
106
106
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" ]
113
108
include_dirs = [
114
109
# The overrides must be included first as that is the mechanism for
115
110
# selecting the override headers in Chromium.
Original file line number Diff line number Diff line change @@ -186,7 +186,6 @@ if (rtc_include_tests) {
186
186
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
187
187
suppressed_configs += [ " //build/config/clang:find_bad_constructs" ]
188
188
}
189
- defines = [ " GTEST_RELATIVE_PATH" ]
190
189
}
191
190
}
192
191
@@ -221,6 +220,5 @@ if (rtc_include_tests) {
221
220
" ../rtc_base:rtc_base_tests_utils" ,
222
221
" //testing/gtest" ,
223
222
]
224
- defines = [ " GTEST_RELATIVE_PATH" ]
225
223
}
226
224
}
Original file line number Diff line number Diff line change @@ -963,10 +963,6 @@ rtc_source_set("gtest_prod") {
963
963
]
964
964
}
965
965
966
- config (" rtc_base_tests_utils_exported_config" ) {
967
- defines = [ " GTEST_RELATIVE_PATH" ]
968
- }
969
-
970
966
rtc_source_set (" rtc_base_tests_utils" ) {
971
967
testonly = true
972
968
sources = [
@@ -1010,7 +1006,6 @@ rtc_source_set("rtc_base_tests_utils") {
1010
1006
" virtualsocketserver.cc" ,
1011
1007
" virtualsocketserver.h" ,
1012
1008
]
1013
- public_configs = [ " :rtc_base_tests_utils_exported_config" ]
1014
1009
deps = [
1015
1010
" :checks" ,
1016
1011
" :rtc_base" ,
@@ -1060,7 +1055,6 @@ if (rtc_include_tests) {
1060
1055
sources = [
1061
1056
" unittest_main.cc" ,
1062
1057
]
1063
- public_configs = [ " :rtc_base_tests_utils_exported_config" ]
1064
1058
deps = [
1065
1059
" :rtc_base" ,
1066
1060
" :rtc_base_approved" ,
Original file line number Diff line number Diff line change 14
14
#include " rtc_base/fakeclock.h"
15
15
#include " rtc_base/logging.h"
16
16
#include " rtc_base/thread.h"
17
- #if defined(GTEST_RELATIVE_PATH)
18
17
#include " test/gtest.h"
19
- #else
20
- #include " testing/base/public/gunit.h"
21
- #endif
22
18
23
19
// Wait until "ex" is true, or "timeout" expires.
24
20
#define WAIT (ex, timeout ) \
Original file line number Diff line number Diff line change 15
15
// Android doesn't use gtest at all, so anything that relies on gtest should
16
16
// check this define first.
17
17
#define NO_GTEST
18
- #elif defined(GTEST_RELATIVE_PATH )
19
- #include "gtest/gtest_prod.h"
20
18
#else
21
- #include "testing/base/gunit_prod .h"
19
+ #include "gtest/gtest_prod .h"
22
20
#endif
23
21
24
22
#endif // RTC_BASE_GUNIT_PROD_H_
Original file line number Diff line number Diff line change @@ -90,10 +90,7 @@ if (rtc_enable_protobuf) {
90
90
deps += [ " :network_tester_unittests_bundle_data" ]
91
91
}
92
92
93
- defines = [
94
- " GTEST_RELATIVE_PATH" ,
95
- " WEBRTC_NETWORK_TESTER_TEST_ENABLED" ,
96
- ]
93
+ defines = [ " WEBRTC_NETWORK_TESTER_TEST_ENABLED" ]
97
94
98
95
data = network_tester_unittests_resources
99
96
Original file line number Diff line number Diff line change @@ -890,7 +890,6 @@ if (is_ios || is_mac) {
890
890
# https://developer.apple.com/library/mac/qa/qa1490/_index.html
891
891
ldflags = [ " -ObjC" ]
892
892
893
- defines = [ " GTEST_RELATIVE_PATH" ]
894
893
deps = [
895
894
" :common_objc" ,
896
895
" :mediaconstraints_objc" ,
You can’t perform that action at this time.
0 commit comments