Index: build/linux/system.gyp |
diff --git a/build/linux/system.gyp b/build/linux/system.gyp |
index 41cb82437c22fa8c9945817742d2376ba418dee3..dc1a55f391d13da287b1976975b47d016f3bf173 100644 |
--- a/build/linux/system.gyp |
+++ b/build/linux/system.gyp |
@@ -30,7 +30,7 @@ |
'targets': [ |
{ |
'target_name': 'gtk', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'direct_dependent_settings': { |
@@ -55,7 +55,7 @@ |
}, |
{ |
'target_name': 'gtkprint', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'direct_dependent_settings': { |
@@ -75,7 +75,7 @@ |
}, |
{ |
'target_name': 'ssl', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'conditions': [ |
@@ -132,7 +132,7 @@ |
}, |
{ |
'target_name': 'freetype2', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'direct_dependent_settings': { |
@@ -152,7 +152,7 @@ |
}, |
{ |
'target_name': 'fontconfig', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'direct_dependent_settings': { |
@@ -172,7 +172,7 @@ |
}, |
{ |
'target_name': 'gdk', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'direct_dependent_settings': { |
@@ -192,7 +192,7 @@ |
}, |
{ |
'target_name': 'gconf', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['use_gconf==1 and _toolset=="target"', { |
'direct_dependent_settings': { |
@@ -215,7 +215,7 @@ |
}, |
{ |
'target_name': 'gio', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['use_gio==1 and _toolset=="target"', { |
'direct_dependent_settings': { |
@@ -250,7 +250,7 @@ |
}, |
{ |
'target_name': 'x11', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'direct_dependent_settings': { |
@@ -271,7 +271,7 @@ |
}, |
{ |
'target_name': 'xext', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'direct_dependent_settings': { |
@@ -291,7 +291,7 @@ |
}, |
{ |
'target_name': 'libgcrypt', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target" and use_cups==1', { |
'direct_dependent_settings': { |
@@ -308,7 +308,7 @@ |
}, |
{ |
'target_name': 'selinux', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['_toolset=="target"', { |
'link_settings': { |
@@ -320,7 +320,7 @@ |
}, |
{ |
'target_name': 'gnome_keyring', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['use_gnome_keyring==1', { |
'direct_dependent_settings': { |
@@ -363,7 +363,7 @@ |
# 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': { |
@@ -392,7 +392,7 @@ |
}, |
{ |
'target_name': 'dbus', |
- 'type': 'settings', |
+ 'type': 'none', |
'direct_dependent_settings': { |
'cflags': [ |
'<!@(<(pkg-config) --cflags dbus-1)', |
@@ -410,7 +410,7 @@ |
{ |
# 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)', |
@@ -427,7 +427,7 @@ |
}, |
{ |
'target_name': 'glib', |
- 'type': 'settings', |
+ 'type': 'none', |
'direct_dependent_settings': { |
'cflags': [ |
'<!@(<(pkg-config) --cflags glib-2.0)', |
@@ -444,7 +444,7 @@ |
}, |
{ |
'target_name': 'libresolv', |
- 'type': 'settings', |
+ 'type': 'none', |
'link_settings': { |
'libraries': [ |
'-lresolv', |
@@ -453,7 +453,7 @@ |
}, |
{ |
'target_name': 'ibus', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['use_ibus==1', { |
'variables': { |
@@ -478,7 +478,7 @@ |
}, |
{ |
'target_name': 'wayland', |
- 'type': 'settings', |
+ 'type': 'none', |
'conditions': [ |
['use_wayland == 1', { |
'cflags': [ |