| 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/args.h" | 5 #include "tools/gn/args.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "tools/gn/variables.h" | 8 #include "tools/gn/variables.h" |
| 9 | 9 |
| 10 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 lock_.AssertAcquired(); | 215 lock_.AssertAcquired(); |
| 216 | 216 |
| 217 // Host OS. | 217 // Host OS. |
| 218 const char* os = NULL; | 218 const char* os = NULL; |
| 219 #if defined(OS_WIN) | 219 #if defined(OS_WIN) |
| 220 os = "win"; | 220 os = "win"; |
| 221 #elif defined(OS_MACOSX) | 221 #elif defined(OS_MACOSX) |
| 222 os = "mac"; | 222 os = "mac"; |
| 223 #elif defined(OS_LINUX) | 223 #elif defined(OS_LINUX) |
| 224 os = "linux"; | 224 os = "linux"; |
| 225 #elif defined(OS_ANDROID) |
| 226 os = "android"; |
| 225 #else | 227 #else |
| 226 #error Unknown OS type. | 228 #error Unknown OS type. |
| 227 #endif | 229 #endif |
| 228 Value os_val(NULL, std::string(os)); | 230 Value os_val(NULL, std::string(os)); |
| 229 dest->SetValue(variables::kBuildOs, os_val, NULL); | 231 dest->SetValue(variables::kBuildOs, os_val, NULL); |
| 230 dest->SetValue(variables::kOs, os_val, NULL); | 232 dest->SetValue(variables::kOs, os_val, NULL); |
| 231 | 233 |
| 232 // Host architecture. | 234 // Host architecture. |
| 233 static const char kX86[] = "x86"; | 235 static const char kX86[] = "x86"; |
| 234 static const char kX64[] = "x64"; | 236 static const char kX64[] = "x64"; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 i != values.end(); ++i) | 293 i != values.end(); ++i) |
| 292 scope->SetValue(i->first, i->second, i->second.origin()); | 294 scope->SetValue(i->first, i->second, i->second.origin()); |
| 293 } | 295 } |
| 294 | 296 |
| 295 void Args::SaveOverrideRecordLocked(const Scope::KeyValueMap& values) const { | 297 void Args::SaveOverrideRecordLocked(const Scope::KeyValueMap& values) const { |
| 296 lock_.AssertAcquired(); | 298 lock_.AssertAcquired(); |
| 297 for (Scope::KeyValueMap::const_iterator i = values.begin(); | 299 for (Scope::KeyValueMap::const_iterator i = values.begin(); |
| 298 i != values.end(); ++i) | 300 i != values.end(); ++i) |
| 299 all_overrides_[i->first] = i->second; | 301 all_overrides_[i->first] = i->second; |
| 300 } | 302 } |
| OLD | NEW |