Remove os_nix from gyp variables.

build/common.gypi

 # Copyright (c) 2011 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 20 matching lines @@
         # To do a shared build on linux we need to be able to choose between
         # type static_library and shared_library. We default to doing a static
         # build but you can override this with "gyp -Dlibrary=shared_library"
         # or you can add the following line (without the #) to
         # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
         # to compile as shared by default
         'library%': 'static_library',
 
         # Compute the architecture that we're building on.
         'conditions': [
-          [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+          [ 'OS=="win" or OS=="mac", {
+            'host_arch%': 'ia32',
+          }, {
             # This handles the Unix platforms for which there is some support.
             # Anything else gets passed through, which probably won't work very
             # well; such hosts should pass an explicit target_arch to gyp.
             'host_arch%':
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
-            'os_nix%': 1,
-          }, { # OS=="win" or OS=="mac"
-            'host_arch%': 'ia32',
-            'os_nix%': 0,
           }],
 
           # Set default value of toolkit_views on for Windows, Chrome OS
           # and the touch UI.
           ['OS=="win" or chromeos==1 or touchui==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'touchui%': '<(touchui)',
       'host_arch%': '<(host_arch)',
       'library%': '<(library)',
       'toolkit_views%': '<(toolkit_views)',
-      'os_nix%': '<(os_nix)',
 
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
 
       # Override buildtype to select the desired build flavor.
       # Dev - everyday build for development/testing
       # Official - release build (generally implies additional processing)
       # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
       # conversion is done), some of the things which are now controlled by
       # 'branding', such as symbol generation, will need to be refactored based
@@ skipping 57 matching lines @@
       'p2p_apis%': 1,
 
       # If this is set, the clang plugins used on the buildbot will be used.
       # Run tools/clang/scripts/update.sh to make sure they are compiled.
       # This causes 'clang_chrome_plugins_flags' to be set.
       # Has no effect if 'clang' is not set as well.
       'clang_use_chrome_plugins%': 0,
 
       'conditions': [
         # A flag for POSIX platforms
-        ['os_nix==1 or OS=="mac"', {
+        ['OS=="win"', {
+          'os_posix%': 0,
+        }, {
           'os_posix%': 1,
-        }, {
-          'os_posix%': 0,
         }],
 
         # Flags to use Gtk and X11 on non-Mac POSIX platforms
-        ['os_nix==1', {
+        ['OS=="win" or OS=="mac"', {
+          'toolkit_uses_gtk%': 0,
+          'use_x11%': 0,
+        }, {
           'toolkit_uses_gtk%': 1,
           'use_x11%': 1,
-        }, {
-          'toolkit_uses_gtk%': 0,
-          'use_x11%': 0,
         }],
 
         # A flag to enable or disable our compile-time dependency
         # on gnome-keyring. If that dependency is disabled, no gnome-keyring
         # support will be available. This option is useful
         # for Linux distributions.
         ['chromeos==1', {
           'use_gnome_keyring%': 0,
         }, {
           'use_gnome_keyring%': 1,
@@ skipping 1571 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: