diff options
| author |  ulfjack <ulfjack@google.com> | 2018-06-13 07:59:33 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-13 08:02:50 -0700 |
| commit | b5daae329c66e6e7cff7db33a451165b56f8f9ee (patch) | |
| tree | d6afb290336a82e0230b3b04ff807cf402270444 /src/main/java/com/google/devtools/build/lib/runtime | |
| parent | f282cc724f0cb4cf99a82a11769643cc357be880 (diff) | |
Move BuildView.Options to a new top-level class
This is in preparation for dismantling BuildView and merging the relevant
parts into AnalysisPhaseRunner.
PiperOrigin-RevId: 200391088
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java | 4 |
2 files changed, 4 insertions, 4 deletions
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 3870931203..4ff1089da5 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 @@ -19,8 +19,8 @@ import com.google.common.base.Preconditions; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.actions.PackageRootResolver; import com.google.devtools.build.lib.actions.cache.ActionCache; +import com.google.devtools.build.lib.analysis.AnalysisOptions; import com.google.devtools.build.lib.analysis.BlazeDirectories; -import com.google.devtools.build.lib.analysis.BuildView.Options; import com.google.devtools.build.lib.analysis.SkyframePackageRootResolver; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.DefaultsPackage; @@ -622,7 +622,7 @@ public final class CommandEnvironment { // Fail fast in the case where a Blaze command forgets to install the package path correctly. skyframeExecutor.setActive(false); // Let skyframe figure out how much incremental state it will be keeping. - Options viewOptions = options.getOptions(Options.class); + AnalysisOptions viewOptions = options.getOptions(AnalysisOptions.class); BuildRequestOptions requestOptions = options.getOptions(BuildRequestOptions.class); skyframeExecutor.decideKeepIncrementalState( runtime.getStartupOptionsProvider().getOptions(BlazeServerStartupOptions.class).batch, diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java index 4803aaf115..14b6c19c01 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/BuildCommand.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.runtime.commands; -import com.google.devtools.build.lib.analysis.BuildView; +import com.google.devtools.build.lib.analysis.AnalysisOptions; import com.google.devtools.build.lib.buildtool.BuildRequest; import com.google.devtools.build.lib.buildtool.BuildRequestOptions; import com.google.devtools.build.lib.buildtool.BuildTool; @@ -45,7 +45,7 @@ import java.util.List; ExecutionOptions.class, LocalExecutionOptions.class, PackageCacheOptions.class, - BuildView.Options.class, + AnalysisOptions.class, LoadingOptions.class, KeepGoingOption.class, LoadingPhaseThreadsOption.class |