Rollback of commit 855fbe9ee447b7b37fd8c73dbc047d69b7ceffcf.

*** Reason for rollback ***

Causing bazel server restart every time on Windows
See https://github.com/bazelbuild/bazel/issues/2466

*** Original change description ***

Bazel client: platform-specific JoinPath 

This allows joining paths on "\" instead of "/"
when building for Windows.

See https://github.com/bazelbuild/bazel/issues/2107

--
PiperOrigin-RevId: 146246700
MOS_MIGRATED_REVID=146246700

1 files changed, 25 insertions, 0 deletions

diff --git a/src/main/cpp/util/file.cc b/src/main/cpp/util/file.cc
index cae87198a7..392af372af 100644
--- a/src/main/cpp/util/file.cc
+++ b/src/main/cpp/util/file.cc
@@ -77,6 +77,31 @@ string Basename(const string &path) {
   return SplitPath(path).second;
 }
 
+string JoinPath(const string &path1, const string &path2) {
+  if (path1.empty()) {
+    // "" + "/bar"
+    return path2;
+  }
+
+  if (path1[path1.size() - 1] == '/') {
+    if (path2.find('/') == 0) {
+      // foo/ + /bar
+      return path1 + path2.substr(1);
+    } else {
+      // foo/ + bar
+      return path1 + path2;
+    }
+  } else {
+    if (path2.find('/') == 0) {
+      // foo + /bar
+      return path1 + path2;
+    } else {
+      // foo + bar
+      return path1 + "/" + path2;
+    }
+  }
+}
+
 class DirectoryTreeWalker : public DirectoryEntryConsumer {
  public:
   DirectoryTreeWalker(vector<string> *files,