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/setup.h" | 5 #include "tools/gn/setup.h" |
6 | 6 |
7 #include <stdlib.h> | 7 #include <stdlib.h> |
8 | |
9 #include <algorithm> | 8 #include <algorithm> |
10 #include <sstream> | 9 #include <sstream> |
| 10 #include <utility> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/files/file_path.h" | 14 #include "base/files/file_path.h" |
15 #include "base/files/file_util.h" | 15 #include "base/files/file_util.h" |
16 #include "base/process/launch.h" | 16 #include "base/process/launch.h" |
17 #include "base/strings/string_split.h" | 17 #include "base/strings/string_split.h" |
18 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
645 if (!item.VerifyTypeIs(Value::STRING, &err)) { | 645 if (!item.VerifyTypeIs(Value::STRING, &err)) { |
646 err.PrintToStdout(); | 646 err.PrintToStdout(); |
647 return false; | 647 return false; |
648 } | 648 } |
649 whitelist->insert(current_dir.ResolveRelativeFile(item, &err)); | 649 whitelist->insert(current_dir.ResolveRelativeFile(item, &err)); |
650 if (err.has_error()) { | 650 if (err.has_error()) { |
651 err.PrintToStdout(); | 651 err.PrintToStdout(); |
652 return false; | 652 return false; |
653 } | 653 } |
654 } | 654 } |
655 build_settings_.set_exec_script_whitelist(whitelist.Pass()); | 655 build_settings_.set_exec_script_whitelist(std::move(whitelist)); |
656 } | 656 } |
657 | 657 |
658 return true; | 658 return true; |
659 } | 659 } |
OLD | NEW |