diff options
author | 2016-03-30 07:26:46 +0000 | |
---|---|---|
committer | 2016-03-30 08:20:28 +0000 | |
commit | 16aa254795e1affcd11cf39f2df7345d3d664e0e (patch) | |
tree | 2cec653a93aec1633b0299012a6ec21ad337b1c6 /src/main/java/com/google/devtools/build/lib/runtime | |
parent | 7cb57ff9852f1099ce9a865929d25e53198b8350 (diff) |
Move the BuildView creation to BuildTool, the only remaining user.
--
MOS_MIGRATED_REVID=118547283
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java index 5b291c039a..7c598c0eed 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java @@ -234,7 +234,7 @@ public final class BlazeRuntime { return builder.build(); } - @Nullable CoverageReportActionFactory getCoverageReportActionFactory() { + @Nullable public CoverageReportActionFactory getCoverageReportActionFactory() { CoverageReportActionFactory firstFactory = null; for (BlazeModule module : blazeModules) { CoverageReportActionFactory factory = module.getCoverageReportFactory(); diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java index f0a424c741..acbd1200fa 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java @@ -81,8 +81,6 @@ public final class CommandEnvironment { private final Map<String, String> clientEnv = new HashMap<>(); private final TimestampGranularityMonitor timestampGranularityMonitor; - private BuildView view; - private PathFragment relativeWorkingDirectory = PathFragment.EMPTY_FRAGMENT; private long commandStartTime; private OutputService outputService; @@ -188,10 +186,6 @@ public final class CommandEnvironment { return result; } - public BuildView getView() { - return view; - } - public PackageRootResolver getPackageRootResolver() { return new SkyframePackageRootResolver(getSkyframeExecutor(), reporter); } @@ -335,12 +329,6 @@ public final class CommandEnvironment { return outputFileSystem; } - @VisibleForTesting - public void initViewForTesting() { - this.view = new BuildView(runtime.getDirectories(), runtime.getRuleClassProvider(), - runtime.getSkyframeExecutor(), runtime.getCoverageReportActionFactory()); - } - /** * Hook method called by the BlazeCommandDispatcher prior to the dispatch of * each command. @@ -397,8 +385,6 @@ public final class CommandEnvironment { runtime.getStartupOptionsProvider().getOptions(BlazeServerStartupOptions.class).batch, optionsParser.getOptions(BuildView.Options.class)); - initViewForTesting(); - // Start the performance and memory profilers. runtime.beforeCommand(this, options, execStartTimeNanos); |