diff options
| author | andrewhayden <andrewhayden@chromium.org> | 2014-11-07 04:30:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 12:30:37 +0000 |
| commit | 6f23953816888b9b5683216ec6f4579a820be46d (patch) | |
| tree | 1dea807f5fb23d7c46be973a9c86ace048a2491c /third_party | |
| parent | d52161641eceb225c752261eb75f07556a2d24a4 (diff) | |
| download | chromium_src-6f23953816888b9b5683216ec6f4579a820be46d.zip chromium_src-6f23953816888b9b5683216ec6f4579a820be46d.tar.gz chromium_src-6f23953816888b9b5683216ec6f4579a820be46d.tar.bz2 | |
Roll src/third_party/cld_2/src fe53e1c:14d9ef8 (svn 171:193)
Summary of changes available at:
https://chromium.googlesource.com/external/cld2/+log/fe53e1c..14d9ef8
This version of CLD2 supports several new languages and offers improved safety
for dealing with invalid UTF-8 bytestreams, offering API compatibility along
with new functions that provide these safeguards.
BUG=334448
TBR=toyoshim@chromium.org
Review URL: https://codereview.chromium.org/706173003
Cr-Commit-Position: refs/heads/master@{#303224}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/cld_2/BUILD.gn | 12 | ||||
| -rw-r--r-- | third_party/cld_2/cld_2.gyp | 22 |
2 files changed, 14 insertions, 20 deletions
diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn index 61f3378..c4d9dc0 100644 --- a/third_party/cld_2/BUILD.gn +++ b/third_party/cld_2/BUILD.gn @@ -61,18 +61,16 @@ data_loader_files = [ source_set("cld2_data") { sources = [ "src/internal/cld2_generated_cjk_compatible.cc", - "src/internal/cld2_generated_deltaoctachrome0122.cc", - "src/internal/cld2_generated_distinctoctachrome0122.cc", + "src/internal/cld2_generated_deltaoctachrome.cc", + "src/internal/cld2_generated_distinctoctachrome.cc", "src/internal/cld_generated_cjk_delta_bi_4.cc", "src/internal/cld_generated_cjk_uni_prop_80.cc", - "src/internal/cld_generated_score_quad_octa_0122_2.cc", + "src/internal/cld_generated_score_quad_octa_2.cc", ] if (cld2_table_size == 0) { - sources += [ "src/internal/cld2_generated_quadchrome0122_16.cc" ] - } else if (cld2_table_size == 1) { - sources += [ "src/internal/cld2_generated_quadchrome0122_19.cc" ] + sources += [ "src/internal/cld2_generated_quadchrome_16.cc" ] } else if (cld2_table_size == 2) { - sources += [ "src/internal/cld2_generated_quadchrome0122_2.cc" ] + sources += [ "src/internal/cld2_generated_quadchrome_2.cc" ] } include_dirs = [ diff --git a/third_party/cld_2/cld_2.gyp b/third_party/cld_2/cld_2.gyp index cde2bd3..6cda402 100644 --- a/third_party/cld_2/cld_2.gyp +++ b/third_party/cld_2/cld_2.gyp @@ -2,12 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Note to maintainers: In the January 2014 release (*_0122*), there are some -# options for building: +# Note to maintainers: In the October 2014 release, there are some options for +# building: # Pick one quadgram file (cld2_generated_quadchrome*.cc): -# 0122_16 = 160K entries, smallest size, lowest accuracy (set cld2_table_size=0) -# 0122_19 = 192K entries, medium size, medium accuracy (set cld2_table_size=1) -# 0122_2 = 256K entries, largest size, highest accuracy (set cld2_table_size=2) +# _16 = 160K entries, smallest size, lowest accuracy (set cld2_table_size=0) +# _2 = 256K entries, largest size, highest accuracy (set cld2_table_size=2) # # For the CJK bigram file (cld_generated_cjk_delta_bi*.cc), always use # cld_generated_cjk_delta_bi_4.cc, as this is intended for use with Chromium. @@ -76,22 +75,19 @@ ], 'cld2_data_sources': [ 'src/internal/cld2_generated_cjk_compatible.cc', - 'src/internal/cld2_generated_deltaoctachrome0122.cc', - 'src/internal/cld2_generated_distinctoctachrome0122.cc', + 'src/internal/cld2_generated_deltaoctachrome.cc', + 'src/internal/cld2_generated_distinctoctachrome.cc', 'src/internal/cld_generated_cjk_delta_bi_4.cc', 'src/internal/cld_generated_cjk_uni_prop_80.cc', - 'src/internal/cld_generated_score_quad_octa_0122_2.cc', + 'src/internal/cld_generated_score_quad_octa_2.cc', 'src/internal/generated_distinct_bi_0.cc', ], 'conditions': [ ['cld2_table_size==0', { - 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome0122_16.cc'] - }], - ['cld2_table_size==1', { - 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome0122_19.cc'] + 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome_16.cc'] }], ['cld2_table_size==2', { - 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome0122_2.cc'] + 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome_2.cc'] }], ], }, |