Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: webrtc/base/gunit.h

Issue 1945803003: Revert of Remove the rtc_relative_path GYP variable and similar defines (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/base_tests.gyp ('k') | webrtc/base/gunit_prod.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/gunit.h
diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h
index 986d4dcb623d70000679589b91d85fad00ca919e..1a6c36374e935e46a81a1496fe04539fc40f57d9 100644
--- a/webrtc/base/gunit.h
+++ b/webrtc/base/gunit.h
@@ -13,7 +13,11 @@
#include "webrtc/base/logging.h"
#include "webrtc/base/thread.h"
+#if defined(GTEST_RELATIVE_PATH)
#include "testing/gtest/include/gtest/gtest.h"
+#else
+#include "testing/base/public/gunit.h"
+#endif
// Wait until "ex" is true, or "timeout" expires.
#define WAIT(ex, timeout) \
« no previous file with comments | « webrtc/base/base_tests.gyp ('k') | webrtc/base/gunit_prod.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698