Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Side by Side Diff: tools/gn/label.cc

Issue 1155713006: GN: Make file/dir resolving return errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tools/gn/functions.cc ('k') | tools/gn/label_pattern.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "tools/gn/label.h" 5 #include "tools/gn/label.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "tools/gn/err.h" 9 #include "tools/gn/err.h"
10 #include "tools/gn/filesystem_utils.h" 10 #include "tools/gn/filesystem_utils.h"
(...skipping 19 matching lines...) Expand all
30 const SourceDir& current_dir, 30 const SourceDir& current_dir,
31 const base::StringPiece& input, 31 const base::StringPiece& input,
32 SourceDir* result, 32 SourceDir* result,
33 Err* err) { 33 Err* err) {
34 // No rule, use the current location. 34 // No rule, use the current location.
35 if (input.empty()) { 35 if (input.empty()) {
36 *result = current_dir; 36 *result = current_dir;
37 return true; 37 return true;
38 } 38 }
39 39
40 *result = current_dir.ResolveRelativeDir(input); 40 *result = current_dir.ResolveRelativeDir(input_value, input, err);
41 return true; 41 return true;
42 } 42 }
43 43
44 // Given the separated-out target name (after the colon) computes the final 44 // Given the separated-out target name (after the colon) computes the final
45 // name, using the implicit name from the previously-generated 45 // name, using the implicit name from the previously-generated
46 // computed_location if necessary. The input_value is used only for generating 46 // computed_location if necessary. The input_value is used only for generating
47 // error messages. 47 // error messages.
48 bool ComputeTargetNameFromDep(const Value& input_value, 48 bool ComputeTargetNameFromDep(const Value& input_value,
49 const SourceDir& computed_location, 49 const SourceDir& computed_location,
50 const base::StringPiece& input, 50 const base::StringPiece& input,
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 } 270 }
271 return ret; 271 return ret;
272 } 272 }
273 273
274 std::string Label::GetUserVisibleName(const Label& default_toolchain) const { 274 std::string Label::GetUserVisibleName(const Label& default_toolchain) const {
275 bool include_toolchain = 275 bool include_toolchain =
276 default_toolchain.dir() != toolchain_dir_ || 276 default_toolchain.dir() != toolchain_dir_ ||
277 default_toolchain.name() != toolchain_name_; 277 default_toolchain.name() != toolchain_name_;
278 return GetUserVisibleName(include_toolchain); 278 return GetUserVisibleName(include_toolchain);
279 } 279 }
OLDNEW
« no previous file with comments | « tools/gn/functions.cc ('k') | tools/gn/label_pattern.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698