summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--third_party/harfbuzz/harfbuzz.gyp4
-rw-r--r--third_party/sqlite/sqlite.gyp4
3 files changed, 5 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index d82a6bb..18450f8 100644
--- a/DEPS
+++ b/DEPS
@@ -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",
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