| 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/binary_target_generator.h" | 5 #include "tools/gn/binary_target_generator.h" |
| 6 | 6 |
| 7 #include "tools/gn/config_values_generator.h" | 7 #include "tools/gn/config_values_generator.h" |
| 8 #include "tools/gn/err.h" | 8 #include "tools/gn/err.h" |
| 9 #include "tools/gn/scope.h" | 9 #include "tools/gn/scope.h" |
| 10 #include "tools/gn/variables.h" | 10 #include "tools/gn/variables.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 target_->set_output_type(output_type_); | 26 target_->set_output_type(output_type_); |
| 27 | 27 |
| 28 FillOutputName(); | 28 FillOutputName(); |
| 29 if (err_->has_error()) | 29 if (err_->has_error()) |
| 30 return; | 30 return; |
| 31 | 31 |
| 32 FillOutputExtension(); | 32 FillOutputExtension(); |
| 33 if (err_->has_error()) | 33 if (err_->has_error()) |
| 34 return; | 34 return; |
| 35 | 35 |
| 36 FillExternal(); | |
| 37 if (err_->has_error()) | |
| 38 return; | |
| 39 | |
| 40 FillSources(); | 36 FillSources(); |
| 41 if (err_->has_error()) | 37 if (err_->has_error()) |
| 42 return; | 38 return; |
| 43 | 39 |
| 44 FillSourcePrereqs(); | 40 FillSourcePrereqs(); |
| 45 if (err_->has_error()) | 41 if (err_->has_error()) |
| 46 return; | 42 return; |
| 47 | 43 |
| 48 FillConfigs(); | 44 FillConfigs(); |
| 49 if (err_->has_error()) | 45 if (err_->has_error()) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 67 } | 63 } |
| 68 | 64 |
| 69 void BinaryTargetGenerator::FillOutputExtension() { | 65 void BinaryTargetGenerator::FillOutputExtension() { |
| 70 const Value* value = scope_->GetValue(variables::kOutputExtension, true); | 66 const Value* value = scope_->GetValue(variables::kOutputExtension, true); |
| 71 if (!value) | 67 if (!value) |
| 72 return; | 68 return; |
| 73 if (!value->VerifyTypeIs(Value::STRING, err_)) | 69 if (!value->VerifyTypeIs(Value::STRING, err_)) |
| 74 return; | 70 return; |
| 75 target_->set_output_extension(value->string_value()); | 71 target_->set_output_extension(value->string_value()); |
| 76 } | 72 } |
| OLD | NEW |