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}
china20 · Aug 8, 2018 · 8e5014a · 8e5014a
1 parent c234203
commit 8e5014a
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 26 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -104,12 +104,7 @@ config("common_inherited_config") {
     defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ]
   }
   if (build_with_chromium) {
-    defines += [
-      # TODO(kjellander): Cleanup unused ones and move defines closer to
-      # the source when webrtc:4256 is completed.
-      "GTEST_RELATIVE_PATH",
-      "WEBRTC_CHROMIUM_BUILD",
-    ]
+    defines += [ "WEBRTC_CHROMIUM_BUILD" ]
     include_dirs = [
       # The overrides must be included first as that is the mechanism for
       # selecting the override headers in Chromium.

diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
@@ -186,7 +186,6 @@ if (rtc_include_tests) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
-    defines = [ "GTEST_RELATIVE_PATH" ]
   }
 }
 
@@ -221,6 +220,5 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base_tests_utils",
       "//testing/gtest",
     ]
-    defines = [ "GTEST_RELATIVE_PATH" ]
   }
 }
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
@@ -963,10 +963,6 @@ rtc_source_set("gtest_prod") {
   ]
 }
 
-config("rtc_base_tests_utils_exported_config") {
-  defines = [ "GTEST_RELATIVE_PATH" ]
-}
-
 rtc_source_set("rtc_base_tests_utils") {
   testonly = true
   sources = [
@@ -1010,7 +1006,6 @@ rtc_source_set("rtc_base_tests_utils") {
     "virtualsocketserver.cc",
     "virtualsocketserver.h",
   ]
-  public_configs = [ ":rtc_base_tests_utils_exported_config" ]
   deps = [
     ":checks",
     ":rtc_base",
@@ -1060,7 +1055,6 @@ if (rtc_include_tests) {
     sources = [
       "unittest_main.cc",
     ]
-    public_configs = [ ":rtc_base_tests_utils_exported_config" ]
     deps = [
       ":rtc_base",
       ":rtc_base_approved",

diff --git a/rtc_base/gunit.h b/rtc_base/gunit.h
@@ -14,11 +14,7 @@
 #include "rtc_base/fakeclock.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread.h"
-#if defined(GTEST_RELATIVE_PATH)
 #include "test/gtest.h"
-#else
-#include "testing/base/public/gunit.h"
-#endif
 
 // Wait until "ex" is true, or "timeout" expires.
 #define WAIT(ex, timeout)                                       \

diff --git a/rtc_base/gunit_prod.h b/rtc_base/gunit_prod.h
@@ -15,10 +15,8 @@
 // Android doesn't use gtest at all, so anything that relies on gtest should
 // check this define first.
 #define NO_GTEST
-#elif defined(GTEST_RELATIVE_PATH)
-#include "gtest/gtest_prod.h"
 #else
-#include "testing/base/gunit_prod.h"
+#include "gtest/gtest_prod.h"
 #endif
 
 #endif  // RTC_BASE_GUNIT_PROD_H_
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
@@ -90,10 +90,7 @@ if (rtc_enable_protobuf) {
       deps += [ ":network_tester_unittests_bundle_data" ]
     }
 
-    defines = [
-      "GTEST_RELATIVE_PATH",
-      "WEBRTC_NETWORK_TESTER_TEST_ENABLED",
-    ]
+    defines = [ "WEBRTC_NETWORK_TESTER_TEST_ENABLED" ]
 
     data = network_tester_unittests_resources
 

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
@@ -890,7 +890,6 @@ if (is_ios || is_mac) {
         # https://developer.apple.com/library/mac/qa/qa1490/_index.html
         ldflags = [ "-ObjC" ]
 
-        defines = [ "GTEST_RELATIVE_PATH" ]
         deps = [
           ":common_objc",
           ":mediaconstraints_objc",