Bazel client: platform-specific {Read,Write}File

Move blaze::ReadFile and blaze::WriteFile to
file.h and file_platform.h (thus into the
blaze_util namespace), and update references.

This allows us to implement these methods in a
platform-specific way.

Also move UnlinkPath.

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

--
MOS_MIGRATED_REVID=140328273

2 files changed, 4 insertions, 2 deletions

diff --git a/src/tools/singlejar/output_jar_simple_test.cc b/src/tools/singlejar/output_jar_simple_test.cc
index 5bd0ecabfa..af88f4b26d 100644
--- a/src/tools/singlejar/output_jar_simple_test.cc
+++ b/src/tools/singlejar/output_jar_simple_test.cc
@@ -16,6 +16,7 @@
 
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/util/file.h"
+#include "src/main/cpp/util/file_platform.h"
 #include "src/main/cpp/util/port.h"
 #include "src/main/cpp/util/strings.h"
 #include "src/tools/singlejar/input_jar.h"
@@ -324,7 +325,7 @@ TEST_F(OutputJarSimpleTest, Resources) {
 // --classpath_resources
 TEST_F(OutputJarSimpleTest, ClasspathResources) {
   string res1_path = OutputFilePath("cp_res");
-  ASSERT_TRUE(blaze::WriteFile("line1\nline2\n", res1_path));
+  ASSERT_TRUE(blaze_util::WriteFile("line1\nline2\n", res1_path));
   string out_path = OutputFilePath("out.jar");
   CreateOutput(out_path, {"--classpath_resources", res1_path.c_str()});
   string res = GetEntryContents(out_path, "cp_res");
diff --git a/src/tools/singlejar/test_util.cc b/src/tools/singlejar/test_util.cc
index d0263889b7..b2de761beb 100644
--- a/src/tools/singlejar/test_util.cc
+++ b/src/tools/singlejar/test_util.cc
@@ -23,6 +23,7 @@
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/util/file.h"
+#include "src/main/cpp/util/file_platform.h"
 #include "src/main/cpp/util/strings.h"
 
 #include "gtest/gtest.h"
@@ -107,7 +108,7 @@ string GetEntryContents(const string &zip_path, const string &entry_name) {
 string CreateTextFile(const string& relpath, const char *contents) {
   string out_path = OutputFilePath(relpath);
   blaze::MakeDirectories(blaze_util::Dirname(out_path), 0777);
-  if (blaze::WriteFile(contents, out_path)) {
+  if (blaze_util::WriteFile(contents, out_path)) {
     return out_path;
   }
   ADD_FAILURE() << "Cannot write " << out_path;