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

Unified Diff: tools/gn/config_values_generator.cc

Issue 1530183005: Special-case paths that appear in libs by not prefixing them with -l. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: implicit deps Created 5 years 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
Index: tools/gn/config_values_generator.cc
diff --git a/tools/gn/config_values_generator.cc b/tools/gn/config_values_generator.cc
index ca87d6363aea35c7df189f62ebb8ae1c0f012764..f28b7609260d3b239bacfb3848d21463a9bb1526 100644
--- a/tools/gn/config_values_generator.cc
+++ b/tools/gn/config_values_generator.cc
@@ -24,9 +24,7 @@ void GetStringList(
if (!value)
return; // No value, empty input and succeed.
- std::vector<std::string> result;
- ExtractListOfStringValues(*value, &result, err);
- (config_values->*accessor)().swap(result);
+ ExtractListOfStringValues(*value, &(config_values->*accessor)(), err);
}
void GetDirList(
@@ -79,11 +77,16 @@ void ConfigValuesGenerator::Run() {
FILL_DIR_CONFIG_VALUE( include_dirs)
FILL_STRING_CONFIG_VALUE(ldflags)
FILL_DIR_CONFIG_VALUE( lib_dirs)
- FILL_STRING_CONFIG_VALUE(libs)
#undef FILL_STRING_CONFIG_VALUE
#undef FILL_DIR_CONFIG_VALUE
+ // Libs
+ const Value* libs_value = scope_->GetValue("libs", true);
+ if (libs_value)
brettw 2015/12/21 22:39:28 Since this is multi-line, always use {}
agrieve 2015/12/22 01:17:05 Done.
+ ExtractListOfLibs(scope_->settings()->build_settings(), *libs_value,
+ input_dir_, &config_values_->libs(), err_);
+
// Precompiled headers.
const Value* precompiled_header_value =
scope_->GetValue(variables::kPrecompiledHeader, true);

Powered by Google App Engine
This is Rietveld 408576698