summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorcdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 18:00:54 +0000
committercdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 18:00:54 +0000
commit55954d890dd1f817ea7f49374f1de14d826b2fa4 (patch)
treedd9f64a4d64642a6d9d5c8de019dc5c778016071 /base/base.gyp
parent6df44fb660221182373b00ad27840040167205d7 (diff)
downloadchromium_src-55954d890dd1f817ea7f49374f1de14d826b2fa4.zip
chromium_src-55954d890dd1f817ea7f49374f1de14d826b2fa4.tar.gz
chromium_src-55954d890dd1f817ea7f49374f1de14d826b2fa4.tar.bz2
Commiting second word iterator patch for tsepez. this was originally reviewed at http://codereview.chromium.org/5796003/
Review URL: http://codereview.chromium.org/5707011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp11
1 files changed, 3 insertions, 8 deletions
diff --git a/base/base.gyp b/base/base.gyp
index f68359a..70cf465 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -31,6 +31,8 @@
'base',
],
'sources': [
+ 'i18n/break_iterator.cc',
+ 'i18n/break_iterator.h',
'i18n/char_iterator.cc',
'i18n/char_iterator.h',
'i18n/file_util_icu.cc',
@@ -47,8 +49,6 @@
'i18n/rtl.h',
'i18n/time_formatting.cc',
'i18n/time_formatting.h',
- 'i18n/word_iterator.cc',
- 'i18n/word_iterator.h',
],
},
{
@@ -87,11 +87,11 @@
'gmock_unittest.cc',
'hmac_unittest.cc',
'id_map_unittest.cc',
+ 'i18n/break_iterator_unittest.cc',
'i18n/char_iterator_unittest.cc',
'i18n/file_util_icu_unittest.cc',
'i18n/icu_string_conversions_unittest.cc',
'i18n/rtl_unittest.cc',
- 'i18n/word_iterator_unittest.cc',
'json/json_reader_unittest.cc',
'json/json_writer_unittest.cc',
'json/string_escape_unittest.cc',
@@ -173,11 +173,6 @@
'win/scoped_variant_unittest.cc',
'worker_pool_unittest.cc',
],
- 'include_dirs': [
- # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
- # #include for unicode/uchar.h. This should probably be cleaned up.
- '../third_party/icu/public/common',
- ],
'dependencies': [
'base',
'base_i18n',