diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 20:16:26 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 20:16:26 +0000 |
| commit | 895887baa333ef7cbec77674863f21c1b2c2f28f (patch) | |
| tree | a88b1e89e8340c887671494c1f141ba823ace58c /third_party | |
| parent | 742c34d6fa1040ef3b36dc871a10bdeb6b1135b9 (diff) | |
| download | chromium_src-895887baa333ef7cbec77674863f21c1b2c2f28f.zip chromium_src-895887baa333ef7cbec77674863f21c1b2c2f28f.tar.gz chromium_src-895887baa333ef7cbec77674863f21c1b2c2f28f.tar.bz2 | |
Use type 'none' instead of 'settings', as the latter is invalid in gyp.
gyp currently warns about this, but I intend to make it an error.
Due to the warning this had already been fixed in most of the Chrome tree,
but not in some of the use_system_foo blocks.
(DEPS change: roll ICU forward to pick up same fix.)
Review URL: http://codereview.chromium.org/9287001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/harfbuzz/harfbuzz.gyp | 4 | ||||
| -rw-r--r-- | third_party/sqlite/sqlite.gyp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp index 1ed90b9..6039e0d 100644 --- a/third_party/harfbuzz/harfbuzz.gyp +++ b/third_party/harfbuzz/harfbuzz.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. @@ -64,7 +64,7 @@ # Make the 'harfbuzz' target just shim through to the harfbuzz-ng # one. 'target_name': 'harfbuzz', - 'type': 'settings', + 'type': 'none', 'dependencies': [ '../harfbuzz-ng/harfbuzz.gyp:harfbuzz' ], diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index 4dc0891..6c4316b 100644 --- a/third_party/sqlite/sqlite.gyp +++ b/third_party/sqlite/sqlite.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. @@ -42,7 +42,7 @@ }, }], ['os_posix == 1 and OS != "mac" and use_system_sqlite', { - 'type': 'settings', + 'type': 'none', 'direct_dependent_settings': { 'cflags': [ # This next command produces no output but it it will fail (and |