Rework handling of os and cpu_arch in GN.

tools/gn/variables.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef TOOLS_GN_VARIABLES_H_
 #define TOOLS_GN_VARIABLES_H_
 
 #include <map>
 
 #include "base/strings/string_piece.h"
 
 namespace variables {
 
 // Builtin vars ----------------------------------------------------------------
 
-extern const char kBuildCpuArch[];
-extern const char kBuildCpuArch_HelpShort[];
-extern const char kBuildCpuArch_Help[];
+extern const char kHostCpu[];
+extern const char kHostCpu_HelpShort[];
+extern const char kHostCpu_Help[];
 
-extern const char kBuildOs[];
-extern const char kBuildOs_HelpShort[];
-extern const char kBuildOs_Help[];
+extern const char kHostOs[];
+extern const char kHostOs_HelpShort[];
+extern const char kHostOs_Help[];
 
-extern const char kCpuArch[];
-extern const char kCpuArch_HelpShort[];
-extern const char kCpuArch_Help[];
+extern const char kCurrentCpu[];
+extern const char kCurrentCpu_HelpShort[];
+extern const char kCurrentCpu_Help[];
+
+extern const char kCurrentOs[];
+extern const char kCurrentOs_HelpShort[];
+extern const char kCurrentOs_Help[];
 
 extern const char kCurrentToolchain[];
 extern const char kCurrentToolchain_HelpShort[];
 extern const char kCurrentToolchain_Help[];
 
 extern const char kDefaultToolchain[];
 extern const char kDefaultToolchain_HelpShort[];
 extern const char kDefaultToolchain_Help[];
 
-extern const char kOs[];
-extern const char kOs_HelpShort[];
-extern const char kOs_Help[];
-
 extern const char kPythonPath[];
 extern const char kPythonPath_HelpShort[];
 extern const char kPythonPath_Help[];
 
 extern const char kRootBuildDir[];
 extern const char kRootBuildDir_HelpShort[];
 extern const char kRootBuildDir_Help[];
 
 extern const char kRootGenDir[];
 extern const char kRootGenDir_HelpShort[];
 extern const char kRootGenDir_Help[];
 
 extern const char kRootOutDir[];
 extern const char kRootOutDir_HelpShort[];
 extern const char kRootOutDir_Help[];
 
+extern const char kTargetCpu[];
+extern const char kTargetCpu_HelpShort[];
+extern const char kTargetCpu_Help[];
+
+extern const char kTargetOs[];
+extern const char kTargetOs_HelpShort[];
+extern const char kTargetOs_Help[];
+
 extern const char kTargetGenDir[];
 extern const char kTargetGenDir_HelpShort[];
 extern const char kTargetGenDir_Help[];
 
 extern const char kTargetOutDir[];
 extern const char kTargetOutDir_HelpShort[];
 extern const char kTargetOutDir_Help[];
 
 // Target vars -----------------------------------------------------------------
 
@@ skipping 142 matching lines @@
 // Note: this is used only for help so this getter is not threadsafe.
 const VariableInfoMap& GetBuiltinVariables();
 
 // Returns the variables used by target generators.
 // Note: this is used only for help so this getter is not threadsafe.
 const VariableInfoMap& GetTargetVariables();
 
 }  // namespace variables
 
 #endif  // TOOLS_GN_VARIABLES_H_