| OLD | NEW |
| 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/target_generator.h" | 5 #include "tools/gn/target_generator.h" |
| 6 | 6 |
| 7 #include "tools/gn/action_target_generator.h" | 7 #include "tools/gn/action_target_generator.h" |
| 8 #include "tools/gn/binary_target_generator.h" | 8 #include "tools/gn/binary_target_generator.h" |
| 9 #include "tools/gn/build_settings.h" | 9 #include "tools/gn/build_settings.h" |
| 10 #include "tools/gn/config.h" | 10 #include "tools/gn/config.h" |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 } | 311 } |
| 312 } | 312 } |
| 313 | 313 |
| 314 return true; | 314 return true; |
| 315 } | 315 } |
| 316 | 316 |
| 317 bool TargetGenerator::FillGenericConfigs(const char* var_name, | 317 bool TargetGenerator::FillGenericConfigs(const char* var_name, |
| 318 UniqueVector<LabelConfigPair>* dest) { | 318 UniqueVector<LabelConfigPair>* dest) { |
| 319 const Value* value = scope_->GetValue(var_name, true); | 319 const Value* value = scope_->GetValue(var_name, true); |
| 320 if (value) { | 320 if (value) { |
| 321 ExtractListOfUniqueLabels(*value, scope_->GetSourceDir(), | 321 ExtractListOfUniqueLabels(scope_->settings()->build_settings(), |
| 322 *value, scope_->GetSourceDir(), |
| 322 ToolchainLabelForScope(scope_), dest, err_); | 323 ToolchainLabelForScope(scope_), dest, err_); |
| 323 } | 324 } |
| 324 return !err_->has_error(); | 325 return !err_->has_error(); |
| 325 } | 326 } |
| 326 | 327 |
| 327 bool TargetGenerator::FillGenericDeps(const char* var_name, | 328 bool TargetGenerator::FillGenericDeps(const char* var_name, |
| 328 LabelTargetVector* dest) { | 329 LabelTargetVector* dest) { |
| 329 const Value* value = scope_->GetValue(var_name, true); | 330 const Value* value = scope_->GetValue(var_name, true); |
| 330 if (value) { | 331 if (value) { |
| 331 ExtractListOfLabels(*value, scope_->GetSourceDir(), | 332 ExtractListOfLabels(scope_->settings()->build_settings(), |
| 333 *value, scope_->GetSourceDir(), |
| 332 ToolchainLabelForScope(scope_), dest, err_); | 334 ToolchainLabelForScope(scope_), dest, err_); |
| 333 } | 335 } |
| 334 return !err_->has_error(); | 336 return !err_->has_error(); |
| 335 } | 337 } |
| 336 | 338 |
| 337 bool TargetGenerator::FillForwardDependentConfigs() { | 339 bool TargetGenerator::FillForwardDependentConfigs() { |
| 338 const Value* value = scope_->GetValue( | 340 const Value* value = scope_->GetValue( |
| 339 variables::kForwardDependentConfigsFrom, true); | 341 variables::kForwardDependentConfigsFrom, true); |
| 340 if (value) { | 342 if (value) { |
| 341 ExtractListOfUniqueLabels(*value, scope_->GetSourceDir(), | 343 ExtractListOfUniqueLabels(scope_->settings()->build_settings(), |
| 344 *value, scope_->GetSourceDir(), |
| 342 ToolchainLabelForScope(scope_), | 345 ToolchainLabelForScope(scope_), |
| 343 &target_->forward_dependent_configs(), err_); | 346 &target_->forward_dependent_configs(), err_); |
| 344 } | 347 } |
| 345 return !err_->has_error(); | 348 return !err_->has_error(); |
| 346 } | 349 } |
| OLD | NEW |