diff options
| author |  Googler <noreply@google.com> | 2018-07-27 06:45:34 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-27 06:47:06 -0700 |
| commit | f5923c10b30c0dd53798a4ae188a38616847da64 (patch) | |
| tree | 9745a7e044924095cb857f88b5540458dd518640 | |
| parent | 2193da931c6804c497f8320dcc81e0d119d26c8c (diff) | |
Update ProjectFileSupport to take an OptionsParser.
RELNOTES: None.
PiperOrigin-RevId: 206310700
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/ProjectFile.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/commands/ProjectFileSupport.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ProjectFile.java b/src/main/java/com/google/devtools/build/lib/runtime/ProjectFile.java index 30760ecd1d..793bf4751e 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/ProjectFile.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/ProjectFile.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.runtime; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.Root; +import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; import java.util.List; @@ -39,7 +40,11 @@ public interface ProjectFile { * Returns an (optionally cached) project file instance. If there is no such file, or if the * file cannot be parsed, then it throws an exception. */ - ProjectFile getProjectFile(Path workingDirectory, List<Root> packagePath, PathFragment path) + ProjectFile getProjectFile( + Path workingDirectory, + List<Root> packagePath, + PathFragment path, + OptionsParser optionsParser) throws OptionsParsingException; } 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 a14ff5a23c..d4d54b7f6a 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 @@ -74,7 +74,7 @@ public final class ProjectFileSupport { BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY) .getPathEntries(); ProjectFile projectFile = projectFileProvider.getProjectFile( - workingDir, packagePath, projectFilePath); + workingDir, packagePath, projectFilePath, optionsParser); eventHandler.handle(Event.info("Using " + projectFile.getName())); optionsParser.parse( |