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

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

Issue 1431323003: Remove obsolete OS handling in GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « tools/gn/settings.h ('k') | tools/gn/variables.cc » ('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
(...skipping 11 matching lines...) Expand all
22 toolchain_output_subdir_.value().append(output_subdir_name); 22 toolchain_output_subdir_.value().append(output_subdir_name);
23 23
24 DCHECK(!build_settings->build_dir().is_null()); 24 DCHECK(!build_settings->build_dir().is_null());
25 toolchain_output_dir_ = SourceDir(build_settings->build_dir().value() + 25 toolchain_output_dir_ = SourceDir(build_settings->build_dir().value() +
26 toolchain_output_subdir_.value()); 26 toolchain_output_subdir_.value());
27 } 27 }
28 // The output dir will be null in some tests and when invoked to parsed 28 // The output dir will be null in some tests and when invoked to parsed
29 // one-off data without doing generation. 29 // one-off data without doing generation.
30 if (!toolchain_output_dir_.is_null()) 30 if (!toolchain_output_dir_.is_null())
31 toolchain_gen_dir_ = SourceDir(toolchain_output_dir_.value() + "gen/"); 31 toolchain_gen_dir_ = SourceDir(toolchain_output_dir_.value() + "gen/");
32
33 #if defined(OS_WIN)
34 target_os_ = WIN;
35 #elif defined(OS_MACOSX)
36 target_os_ = MAC;
37 #elif defined(OS_LINUX)
38 target_os_ = LINUX;
39 #elif defined(OS_ANDROID)
40 // Currently we don't have an "Android" target OS, it looks just like Linux
41 // from our perspective.
42 target_os_ = LINUX;
43 #else
44 #error implement me
45 #endif
46 } 32 }
47 33
48 Settings::~Settings() { 34 Settings::~Settings() {
49 } 35 }
OLDNEW
« no previous file with comments | « tools/gn/settings.h ('k') | tools/gn/variables.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698