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

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

Issue 275703003: Make GN Android build link executables (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: whitespace Created 6 years, 7 months 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
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 19 matching lines...) Expand all
30 // one-off data without doing generation. 30 // one-off data without doing generation.
31 if (!toolchain_output_dir_.is_null()) 31 if (!toolchain_output_dir_.is_null())
32 toolchain_gen_dir_ = SourceDir(toolchain_output_dir_.value() + "gen/"); 32 toolchain_gen_dir_ = SourceDir(toolchain_output_dir_.value() + "gen/");
33 33
34 #if defined(OS_WIN) 34 #if defined(OS_WIN)
35 target_os_ = WIN; 35 target_os_ = WIN;
36 #elif defined(OS_MACOSX) 36 #elif defined(OS_MACOSX)
37 target_os_ = MAC; 37 target_os_ = MAC;
38 #elif defined(OS_LINUX) 38 #elif defined(OS_LINUX)
39 target_os_ = LINUX; 39 target_os_ = LINUX;
40 #elif defined(OS_ANDROID)
41 // Currently we don't have an "Android" target OS, it looks just like Linux
42 // from our perspective.
43 target_os_ = LINUX;
40 #else 44 #else
41 #error implement me 45 #error implement me
42 #endif 46 #endif
43 } 47 }
44 48
45 Settings::~Settings() { 49 Settings::~Settings() {
46 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698