Skip to content

Commit

Permalink
Use type 'none' instead of 'settings', as the latter is invalid in gyp.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
evan@chromium.org committed Jan 24, 2012
1 parent 742c34d commit 895887b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ deps = {
"/trunk/deps/third_party/WebKit@76115",

"src/third_party/icu":
"/trunk/deps/third_party/icu46@117933",
"/trunk/deps/third_party/icu46@118861",

"src/third_party/hunspell":
"/trunk/deps/third_party/hunspell@110423",
Expand Down
4 changes: 2 additions & 2 deletions third_party/harfbuzz/harfbuzz.gyp
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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'
],
Expand Down
4 changes: 2 additions & 2 deletions third_party/sqlite/sqlite.gyp
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 895887b

Please sign in to comment.