Remove 'settings' type from gyp files

build/linux/system.gyp

 # 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.
 
 {
   'conditions': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
@@ skipping 12 matching lines @@
       'variables': {
         'use_system_ssl%': 1,
       },
     }],
   ],
 
 
   'targets': [
     {
       'target_name': 'gtk',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
             ],
           },
       }],
       [ 'chromeos==1', {
         'link_settings': {
           'libraries': [ '-lXtst' ]
         }
       }]]
     },
     {
       'target_name': 'gtkprint',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gtk+-unix-print-2.0)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-unix-print-2.0)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)',
             ],
           },
       }]]
     },
     {
       'target_name': 'ssl',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
                 '../../third_party/openssl/openssl.gyp:openssl',
               ],
             }],
             ['use_openssl==0 and use_system_ssl==0', {
               'dependencies': [
@@ skipping 36 matching lines @@
                   '<!@(<(pkg-config) --libs-only-l nss)',
                 ],
               },
             }],
           ]
         }],
       ],
     },
     {
       'target_name': 'freetype2',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags freetype2)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other freetype2)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l freetype2)',
             ],
           },
       }]]
     },
     {
       'target_name': 'fontconfig',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags fontconfig)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other fontconfig)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l fontconfig)',
             ],
           },
       }]]
     },
     {
       'target_name': 'gdk',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gdk-2.0)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-2.0)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
             ],
           },
       }]]
     },
     {
       'target_name': 'gconf',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['use_gconf==1 and _toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gconf-2.0)',
             ],
             'defines': [
               'USE_GCONF',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
             ],
           },
       }]]
     },
     {
       'target_name': 'gio',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['use_gio==1 and _toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gio-2.0)',
             ],
             'defines': [
               'USE_GIO',
             ],
             'conditions': [
@@ skipping 14 matching lines @@
                 'libraries': [
                   '-ldl',
                 ],
               }],
             ],
           },
       }]]
     },
     {
       'target_name': 'x11',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags x11)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l x11 xi)',
             ],
           },
       }],
       ],
     },
     {
       'target_name': 'xext',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags xext)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l xext)',
             ],
           },
       }]]
     },
     {
       'target_name': 'libgcrypt',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target" and use_cups==1', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(libgcrypt-config --cflags)',
             ],
           },
           'link_settings': {
             'libraries': [
               '<!@(libgcrypt-config --libs)',
             ],
           },
       }]]
     },
     {
       'target_name': 'selinux',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['_toolset=="target"', {
           'link_settings': {
             'libraries': [
               '-lselinux',
             ],
           },
       }]]
     },
     {
       'target_name': 'gnome_keyring',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['use_gnome_keyring==1', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gnome-keyring-1)',
             ],
             'defines': [
               'USE_GNOME_KEYRING',
             ],
             'conditions': [
@@ skipping 22 matching lines @@
           ],
         }],
       ],
     },
     {
       # The unit tests use a few convenience functions from the GNOME
       # Keyring library directly. We ignore linux_link_gnome_keyring and
       # link directly in this version of the target to allow this.
       # *** Do not use this target in the main binary! ***
       'target_name': 'gnome_keyring_direct',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['use_gnome_keyring==1', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gnome-keyring-1)',
             ],
             'defines': [
               'USE_GNOME_KEYRING',
             ],
             'conditions': [
               ['linux_link_gnome_keyring==0', {
                 'defines': ['DLOPEN_GNOME_KEYRING'],
               }],
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
             ],
           },
         }],
       ],
     },
     {
       'target_name': 'dbus',
-      'type': 'settings',
+      'type': 'none',
       'direct_dependent_settings': {
         'cflags': [
           '<!@(<(pkg-config) --cflags dbus-1)',
         ],
       },
       'link_settings': {
         'ldflags': [
           '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-1)',
         ],
         'libraries': [
           '<!@(<(pkg-config) --libs-only-l dbus-1)',
         ],
       },
     },
     {
       # TODO(satorux): Remove this once dbus-glib clients are gone.
       'target_name': 'dbus-glib',
-      'type': 'settings',
+      'type': 'none',
       'direct_dependent_settings': {
         'cflags': [
           '<!@(<(pkg-config) --cflags dbus-glib-1)',
         ],
       },
       'link_settings': {
         'ldflags': [
           '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
         ],
         'libraries': [
           '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
         ],
       },
     },
     {
       'target_name': 'glib',
-      'type': 'settings',
+      'type': 'none',
       'direct_dependent_settings': {
         'cflags': [
           '<!@(<(pkg-config) --cflags glib-2.0)',
         ],
       },
       'link_settings': {
         'ldflags': [
           '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)',
         ],
         'libraries': [
           '<!@(<(pkg-config) --libs-only-l glib-2.0)',
         ],
       },
     },
     {
       'target_name': 'libresolv',
-      'type': 'settings',
+      'type': 'none',
       'link_settings': {
         'libraries': [
           '-lresolv',
         ],
       },
     },
     {
       'target_name': 'ibus',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['use_ibus==1', {
           'variables': {
             'ibus_min_version': '1.3.99.20110425',
           },
           'direct_dependent_settings': {
             'defines': ['HAVE_IBUS=1'],
             'cflags': [
               '<!@(<(pkg-config) --cflags "ibus-1.0 >= <(ibus_min_version)")',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other "ibus-1.0 >= <(ibus_min_version)")',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l "ibus-1.0 >= <(ibus_min_version)")',
             ],
           },
         }],
       ],
     },
     {
       'target_name': 'wayland',
-      'type': 'settings',
+      'type': 'none',
       'conditions': [
         ['use_wayland == 1', {
           'cflags': [
             '<!@(<(pkg-config) --cflags cairo wayland-client wayland-egl xkbcommon)',
           ],
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags cairo wayland-client wayland-egl xkbcommon)',
             ],
           },
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other wayland-client wayland-egl xkbcommon)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcommon)',
             ],
           },
         }],
       ],
     },
   ],
 }