Misc small cleanups
This is in preparation for moving py-bin symlinks out of buildtool. Note the deleted field in BlazeRuntime was unused.
RELNOTES: None
PiperOrigin-RevId: 283777726
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 4b7f1a0..395fc30 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -151,8 +151,7 @@
// Unfortunately, the exec root cache is not shared with caches in the remote execution client.
this.fileCache =
- new SingleBuildFileCache(
- env.getExecRoot().getPathString(), env.getRuntime().getFileSystem());
+ new SingleBuildFileCache(env.getExecRoot().getPathString(), runtime.getFileSystem());
this.prefetcher = builder.getActionInputPrefetcher();
this.actionContextProviders = builder.getActionContextProviders();
@@ -287,8 +286,7 @@
// The syntax of this message is tightly constrained by lisp/progmodes/compile.el in emacs
request
.getOutErr()
- .printErrLn(
- env.getRuntime().getProductName() + ": Entering directory `" + getExecRoot() + "/'");
+ .printErrLn(runtime.getProductName() + ": Entering directory `" + getExecRoot() + "/'");
}
Throwable catastrophe = null;
@@ -365,8 +363,7 @@
if (request.isRunningInEmacs()) {
request
.getOutErr()
- .printErrLn(
- env.getRuntime().getProductName() + ": Leaving directory `" + getExecRoot() + "/'");
+ .printErrLn(runtime.getProductName() + ": Leaving directory `" + getExecRoot() + "/'");
}
if (buildCompleted) {
getReporter().handle(Event.progress("Building complete."));