From 50d8c0ee4123f83f831b1f319776e4229e102304 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Thu, 22 Sep 2011 17:59:43 +0000 Subject: 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 --- third_party/bzip2/bzip2.gyp | 2 +- third_party/expat/expat.gyp | 2 +- third_party/libjpeg/libjpeg.gyp | 2 +- third_party/libpng/libpng.gyp | 2 +- third_party/libwebp/libwebp.gyp | 2 +- third_party/libxml/libxml.gyp | 2 +- third_party/libxslt/libxslt.gyp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'third_party') diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp index 42bdf4e..72730df 100644 --- a/third_party/bzip2/bzip2.gyp +++ b/third_party/bzip2/bzip2.gyp @@ -49,7 +49,7 @@ 'targets': [ { 'target_name': 'bzip2', - 'type': 'settings', + 'type': 'none', 'direct_dependent_settings': { 'defines': [ diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index fc91513..b4f2cd5 100644 --- a/third_party/expat/expat.gyp +++ b/third_party/expat/expat.gyp @@ -21,7 +21,7 @@ 'targets': [ { 'target_name': 'expat', - 'type': 'settings', + 'type': 'none', 'link_settings': { 'libraries': [ '-lexpat', diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp index 2fe1f78..12cc882 100644 --- a/third_party/libjpeg/libjpeg.gyp +++ b/third_party/libjpeg/libjpeg.gyp @@ -89,7 +89,7 @@ 'targets': [ { 'target_name': 'libjpeg', - 'type': 'settings', + 'type': 'none', 'direct_dependent_settings': { 'defines': [ 'USE_SYSTEM_LIBJPEG', diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 1b960b1..ffc0369 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -91,7 +91,7 @@ 'targets': [ { 'target_name': 'libpng', - 'type': 'settings', + 'type': 'none', 'dependencies': [ '../zlib/zlib.gyp:zlib', ], diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp index 3acf992..6df7a08 100644 --- a/third_party/libwebp/libwebp.gyp +++ b/third_party/libwebp/libwebp.gyp @@ -64,7 +64,7 @@ 'targets': [ { 'target_name': 'libwebp', - 'type': 'settings', + 'type': 'none', 'direct_dependent_settings': { 'defines': [ 'ENABLE_WEBP', diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 9f27263..56ba94f 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -20,7 +20,7 @@ 'target_name': 'libxml', 'conditions': [ ['os_posix == 1 and OS != "mac" and use_system_libxml', { - 'type': 'settings', + 'type': 'none', 'direct_dependent_settings': { 'cflags': [ '<!@(pkg-config --cflags libxml-2.0)', diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 7dfd093..4ac5e6c 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -22,7 +22,7 @@ 'target_name': 'libxslt', 'conditions': [ ['os_posix == 1 and OS != "mac" and use_system_libxml', { - 'type': 'settings', + 'type': 'none', 'direct_dependent_settings': { 'cflags': [ '<!@(pkg-config --cflags libxslt)', -- cgit v1.1