diff options
| author |  ccalvarin <ccalvarin@google.com> | 2018-04-19 08:47:28 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-19 08:49:16 -0700 |
| commit | d8dfd7882585fafc2be60d42ae996a4a536ac469 (patch) | |
| tree | fc536b0521b0443ce2f6fd067ef0030a7d79199f /src/main/cpp/workspace_layout.h | |
| parent | 3b644d6ba753350165841feadf12a1f401329ee1 (diff) | |
Refactor where rc files are controlled.
In preparation for https://github.com/bazelbuild/bazel/issues/4502, make OptionProcessor::GetRcFiles contain the logic for both the user bazelrcs and the master bazelrcs.
RELNOTES: None
PiperOrigin-RevId: 193521683
Diffstat (limited to 'src/main/cpp/workspace_layout.h')
| -rw-r--r-- | src/main/cpp/workspace_layout.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/cpp/workspace_layout.h b/src/main/cpp/workspace_layout.h index edb2c292e1..3827b87406 100644 --- a/src/main/cpp/workspace_layout.h +++ b/src/main/cpp/workspace_layout.h @@ -48,13 +48,9 @@ class WorkspaceLayout { // Returns if workspace is a valid build workspace. virtual bool InWorkspace(const std::string& workspace) const; - // Returns the candidate master RC file absolute paths. - // All readable files from the result will be used. Empty or nonexistant files - // will be ignored. It is ok if no usable candidate exists. - virtual std::vector<std::string> FindCandidateBlazercPaths( + // Returns the path of the workspace rc file. + virtual std::string GetWorkspaceRcPath( const std::string& workspace, - const std::string& cwd, - const std::string& path_to_binary, const std::vector<std::string>& startup_args) const; // Turn a %workspace%-relative import into its true name in the filesystem. |