Chromium Code Reviews| 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); |