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

Side by Side Diff: trunk/src/tools/gn/settings.cc

Issue 46313006: Revert 232657 "GN: toolchain threading cleanup" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/tools/gn/settings.h ('k') | trunk/src/tools/gn/setup.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/settings.h" 5 #include "tools/gn/settings.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "tools/gn/filesystem_utils.h" 9 #include "tools/gn/filesystem_utils.h"
10 10
11 Settings::Settings(const BuildSettings* build_settings, 11 Settings::Settings(const BuildSettings* build_settings,
12 const Toolchain* toolchain,
12 const std::string& output_subdir_name) 13 const std::string& output_subdir_name)
13 : build_settings_(build_settings), 14 : build_settings_(build_settings),
14 is_default_(false), 15 toolchain_(toolchain),
15 import_manager_(), 16 import_manager_(),
16 base_config_(this), 17 base_config_(this),
17 greedy_target_generation_(false) { 18 greedy_target_generation_(false) {
18 DCHECK(output_subdir_name.find('/') == std::string::npos); 19 DCHECK(output_subdir_name.find('/') == std::string::npos);
19 if (output_subdir_name.empty()) { 20 if (output_subdir_name.empty()) {
20 toolchain_output_dir_ = build_settings->build_dir(); 21 toolchain_output_dir_ = build_settings->build_dir();
21 } else { 22 } else {
22 // We guarantee this ends in a slash. 23 // We guarantee this ends in a slash.
23 toolchain_output_subdir_.value().append(output_subdir_name); 24 toolchain_output_subdir_.value().append(output_subdir_name);
24 toolchain_output_subdir_.value().push_back('/'); 25 toolchain_output_subdir_.value().push_back('/');
(...skipping 14 matching lines...) Expand all
39 target_os_ = LINUX; 40 target_os_ = LINUX;
40 #else 41 #else
41 #error implement me 42 #error implement me
42 #endif 43 #endif
43 } 44 }
44 45
45 Settings::~Settings() { 46 Settings::~Settings() {
46 } 47 }
47 48
48 49
OLDNEW
« no previous file with comments | « trunk/src/tools/gn/settings.h ('k') | trunk/src/tools/gn/setup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698