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

Unified Diff: tools/gn/settings.cc

Issue 279023002: Add GN function get_label_info (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comment Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/settings.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/settings.cc
diff --git a/tools/gn/settings.cc b/tools/gn/settings.cc
index 2715829998b71202624b3ba381d9b197f9d43c22..08f510d59a5bd28b05e5d21429d2dfa407f133c4 100644
--- a/tools/gn/settings.cc
+++ b/tools/gn/settings.cc
@@ -14,13 +14,12 @@ Settings::Settings(const BuildSettings* build_settings,
import_manager_(),
base_config_(this),
greedy_target_generation_(false) {
- DCHECK(output_subdir_name.find('/') == std::string::npos);
if (output_subdir_name.empty()) {
toolchain_output_dir_ = build_settings->build_dir();
} else {
// We guarantee this ends in a slash.
+ DCHECK(output_subdir_name[output_subdir_name.size() - 1] == '/');
toolchain_output_subdir_.value().append(output_subdir_name);
- toolchain_output_subdir_.value().push_back('/');
DCHECK(!build_settings->build_dir().is_null());
toolchain_output_dir_ = SourceDir(build_settings->build_dir().value() +
« no previous file with comments | « tools/gn/settings.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698