Commit 50d8c0ee authored by evan@chromium.org's avatar evan@chromium.org

Remove 'settings' type from gyp files

It is not actually supported by gyp; the fact that it works is a bug
that I am working on fixing.

BUG=96629

Review URL: http://codereview.chromium.org/7889051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102306 0039d316-1c4b-4281-b951-d872f2087c98
parent 6f02d706
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'gtk', 'target_name': 'gtk',
'type': 'settings', 'type': 'none',
'toolsets': ['host', 'target'], 'toolsets': ['host', 'target'],
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
}, },
{ {
'target_name': 'gtkprint', 'target_name': 'gtkprint',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
}, },
{ {
'target_name': 'ssl', 'target_name': 'ssl',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'conditions': [ 'conditions': [
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
}, },
{ {
'target_name': 'freetype2', 'target_name': 'freetype2',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
}, },
{ {
'target_name': 'fontconfig', 'target_name': 'fontconfig',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
}, },
{ {
'target_name': 'gdk', 'target_name': 'gdk',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
}, },
{ {
'target_name': 'gconf', 'target_name': 'gconf',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['use_gconf==1 and _toolset=="target"', { ['use_gconf==1 and _toolset=="target"', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
}, },
{ {
'target_name': 'gio', 'target_name': 'gio',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['use_gio==1 and _toolset=="target"', { ['use_gio==1 and _toolset=="target"', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
}, },
{ {
'target_name': 'xext', 'target_name': 'xext',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
}, },
{ {
'target_name': 'libgcrypt', 'target_name': 'libgcrypt',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target" and use_cups==1', { ['_toolset=="target" and use_cups==1', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
}, },
{ {
'target_name': 'selinux', 'target_name': 'selinux',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'link_settings': { 'link_settings': {
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
}, },
{ {
'target_name': 'gnome_keyring', 'target_name': 'gnome_keyring',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['use_gnome_keyring==1', { ['use_gnome_keyring==1', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
# link directly in this version of the target to allow this. # link directly in this version of the target to allow this.
# *** Do not use this target in the main binary! *** # *** Do not use this target in the main binary! ***
'target_name': 'gnome_keyring_direct', 'target_name': 'gnome_keyring_direct',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['use_gnome_keyring==1', { ['use_gnome_keyring==1', {
'direct_dependent_settings': { 'direct_dependent_settings': {
...@@ -432,7 +432,7 @@ ...@@ -432,7 +432,7 @@
}, },
{ {
'target_name': 'dbus', 'target_name': 'dbus',
'type': 'settings', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
'<!@(<(pkg-config) --cflags dbus-1)', '<!@(<(pkg-config) --cflags dbus-1)',
...@@ -450,7 +450,7 @@ ...@@ -450,7 +450,7 @@
{ {
# TODO(satorux): Remove this once dbus-glib clients are gone. # TODO(satorux): Remove this once dbus-glib clients are gone.
'target_name': 'dbus-glib', 'target_name': 'dbus-glib',
'type': 'settings', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
'<!@(<(pkg-config) --cflags dbus-glib-1)', '<!@(<(pkg-config) --cflags dbus-glib-1)',
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
}, },
{ {
'target_name': 'glib', 'target_name': 'glib',
'type': 'settings', 'type': 'none',
'toolsets': ['host', 'target'], 'toolsets': ['host', 'target'],
'conditions': [ 'conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
}, },
{ {
'target_name': 'libresolv', 'target_name': 'libresolv',
'type': 'settings', 'type': 'none',
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-lresolv', '-lresolv',
...@@ -553,7 +553,7 @@ ...@@ -553,7 +553,7 @@
}, },
{ {
'target_name': 'ibus', 'target_name': 'ibus',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['use_ibus==1', { ['use_ibus==1', {
'variables': { 'variables': {
...@@ -578,7 +578,7 @@ ...@@ -578,7 +578,7 @@
}, },
{ {
'target_name': 'wayland', 'target_name': 'wayland',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
['use_wayland == 1', { ['use_wayland == 1', {
'cflags': [ 'cflags': [
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'sandbox', 'target_name': 'sandbox',
'type': 'settings', 'type': 'none',
'conditions': [ 'conditions': [
# Only compile in the seccomp code for the flag combination # Only compile in the seccomp code for the flag combination
# where we support it. # where we support it.
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'bzip2', 'target_name': 'bzip2',
'type': 'settings', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {
'defines': [ 'defines': [
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'expat', 'target_name': 'expat',
'type': 'settings', 'type': 'none',
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-lexpat', '-lexpat',
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'libjpeg', 'target_name': 'libjpeg',
'type': 'settings', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {
'defines': [ 'defines': [
'USE_SYSTEM_LIBJPEG', 'USE_SYSTEM_LIBJPEG',
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'libpng', 'target_name': 'libpng',
'type': 'settings', 'type': 'none',
'dependencies': [ 'dependencies': [
'../zlib/zlib.gyp:zlib', '../zlib/zlib.gyp:zlib',
], ],
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
'targets': [ 'targets': [
{ {
'target_name': 'libwebp', 'target_name': 'libwebp',
'type': 'settings', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {
'defines': [ 'defines': [
'ENABLE_WEBP', 'ENABLE_WEBP',
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
'target_name': 'libxml', 'target_name': 'libxml',
'conditions': [ 'conditions': [
['os_posix == 1 and OS != "mac" and use_system_libxml', { ['os_posix == 1 and OS != "mac" and use_system_libxml', {
'type': 'settings', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
'<!@(pkg-config --cflags libxml-2.0)', '<!@(pkg-config --cflags libxml-2.0)',
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
'target_name': 'libxslt', 'target_name': 'libxslt',
'conditions': [ 'conditions': [
['os_posix == 1 and OS != "mac" and use_system_libxml', { ['os_posix == 1 and OS != "mac" and use_system_libxml', {
'type': 'settings', 'type': 'none',
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
'<!@(pkg-config --cflags libxslt)', '<!@(pkg-config --cflags libxslt)',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment