1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
index e3beaa49dc..63552b4d73 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java
@@ -18,6 +18,7 @@ import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
 import com.google.devtools.build.lib.runtime.BlazeCommand;
 import com.google.devtools.build.lib.runtime.BlazeRuntime;
+import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.runtime.CommonCommandOptions;
 import com.google.devtools.build.lib.runtime.ProjectFile;
 import com.google.devtools.build.lib.util.AbruptExitException;
@@ -44,8 +45,9 @@ public final class ProjectFileSupport {
    * accordingly. If project files cannot be read or if they contain unparsable options, or if they
    * are not enabled, then it throws an exception instead.
    */
-  public static void handleProjectFiles(BlazeRuntime runtime, OptionsParser optionsParser,
+  public static void handleProjectFiles(CommandEnvironment env, OptionsParser optionsParser,
       String command) throws AbruptExitException {
+    BlazeRuntime runtime = env.getRuntime();
     List<String> targets = optionsParser.getResidue();
     ProjectFile.Provider projectFileProvider = runtime.getProjectFileProvider();
     if (projectFileProvider != null && !targets.isEmpty()
@@ -65,11 +67,11 @@ public final class ProjectFileSupport {
       List<Path> packagePath = PathPackageLocator.create(
           runtime.getOutputBase(),
           optionsParser.getOptions(PackageCacheOptions.class).packagePath,
-          runtime.getReporter(),
+          env.getReporter(),
           runtime.getWorkspace(),
           runtime.getWorkingDirectory()).getPathEntries();
       ProjectFile projectFile = projectFileProvider.getProjectFile(packagePath, projectFilePath);
-      runtime.getReporter().handle(Event.info("Using " + projectFile.getName()));
+      env.getReporter().handle(Event.info("Using " + projectFile.getName()));
 
       try {
         optionsParser.parse(
@@ -77,7 +79,7 @@ public final class ProjectFileSupport {
       } catch (OptionsParsingException e) {
         throw new AbruptExitException(e.getMessage(), ExitCode.COMMAND_LINE_ERROR);
       }
-      runtime.getEventBus().post(new GotProjectFileEvent(projectFile.getName()));
+      env.getEventBus().post(new GotProjectFileEvent(projectFile.getName()));
     }
   }