commit 60fd4da66447cb81c49b31b949e7d2c930a9a9dc
author Elliott Hughes <enh@google.com> Wed Feb 17 21:07:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 17 21:07:22 2016 +0000
tree 70ba0da4e53a17e24ee64b1042642914af9f480f
parent f621c880714050bbb3530c2768f95793137d249d
parent d29946db15545b8e3796727f94e3f8a99d997380

Merge "Remove libbase\'s libutils dependency." am: b3a77b1198
am: 0a475f8dd2

* commit '0a475f8dd25c47093080ccd8f4556bece6713ea8':
  Remove libbase's libutils dependency.

base/test_utils.cpp

diff --git a/base/test_utils.cpp b/base/test_utils.cpp
index 337ba7c..635af6c 100644
--- a/base/test_utils.cpp
+++ b/base/test_utils.cpp
@@ -16,7 +16,6 @@
 
 #include "android-base/logging.h"
 #include "android-base/test_utils.h"
-#include "utils/Compat.h" // For OS_PATH_SEPARATOR.
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -27,6 +26,9 @@
 #if defined(_WIN32)
 #include <windows.h>
 #include <direct.h>
+#define OS_PATH_SEPARATOR '\\'
+#else
+#define OS_PATH_SEPARATOR '/'
 #endif
 
 #include <string>