aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools
diff options
context:
space:
mode:
authorGravatar Thiago Farina <tfarina@chromium.org>2016-12-07 12:40:40 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2016-12-07 12:53:56 +0000
commit227369a44a1061cfb26913cc2609c27801482368 (patch)
tree14f7e974d2b0ee706dbdd3a6663c4ab4ea93b306 /src/tools
parent12474d03da2b49447efd67e6b2ac93cd43539ec4 (diff)
move MakeDirectories() into file_platform.h
This way we can remove the dependency on blaze_util (which is Bazel's client specific) from singlejar. This work was made possible by commit 49970e0136d0: ("Bazel client: platform-specific {Read,Write}File"). -- Change-Id: I6e95fb9119a271e4d48cbe2eefc1d5354ee188aa Reviewed-on: https://cr.bazel.build/7650 PiperOrigin-RevId: 141294165 MOS_MIGRATED_REVID=141294165
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/singlejar/BUILD2
-rw-r--r--src/tools/singlejar/output_jar_simple_test.cc1
-rw-r--r--src/tools/singlejar/test_util.cc4
3 files changed, 1 insertions, 6 deletions
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index 8527daf171..704bf9f45b 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -166,7 +166,6 @@ cc_test(
":options",
":output_jar",
":test_util",
- "//src/main/cpp:blaze_util",
"//src/main/cpp/util",
"//third_party:gtest",
],
@@ -302,7 +301,6 @@ cc_library(
srcs = ["test_util.cc"],
hdrs = ["test_util.h"],
deps = [
- "//src/main/cpp:blaze_util",
"//src/main/cpp/util",
"//third_party:gtest",
],
diff --git a/src/tools/singlejar/output_jar_simple_test.cc b/src/tools/singlejar/output_jar_simple_test.cc
index af88f4b26d..0dbba5e68f 100644
--- a/src/tools/singlejar/output_jar_simple_test.cc
+++ b/src/tools/singlejar/output_jar_simple_test.cc
@@ -14,7 +14,6 @@
#include <stdlib.h>
-#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"
diff --git a/src/tools/singlejar/test_util.cc b/src/tools/singlejar/test_util.cc
index b2de761beb..5b63f80058 100644
--- a/src/tools/singlejar/test_util.cc
+++ b/src/tools/singlejar/test_util.cc
@@ -20,8 +20,6 @@
#include <string>
-#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"
@@ -107,7 +105,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);
+ blaze_util::MakeDirectories(blaze_util::Dirname(out_path), 0777);
if (blaze_util::WriteFile(contents, out_path)) {
return out_path;
}