diff options
author | andrewhayden@chromium.org <andrewhayden@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 16:16:03 +0000 |
---|---|---|
committer | andrewhayden@chromium.org <andrewhayden@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 16:16:03 +0000 |
commit | e5a7a2ab88c9ccb23662f4df213cd7c7a24800f2 (patch) | |
tree | bb70857390e267f53bdda5ab8286bbc5f0a39c64 /build | |
parent | 644616d9f93f76905f37f00fa2317d9a21032008 (diff) | |
download | chromium_src-e5a7a2ab88c9ccb23662f4df213cd7c7a24800f2.zip chromium_src-e5a7a2ab88c9ccb23662f4df213cd7c7a24800f2.tar.gz chromium_src-e5a7a2ab88c9ccb23662f4df213cd7c7a24800f2.tar.bz2 |
Make it possible to read CLD data from a file.
Note that this change DOES NOT "opt-in" any platform at this time, it merely
makes it possible to read the CLD data in from a file if cld_version=2 and
cld_dynamic=1. Subsequent changes will be required for platforms to "opt-in"
to using this approach; e.g., each platform will have to generate their data
file and package it appropriately before turning this feature on in compile
flags.
IMPORTANT: Can't be enabled on on Android until the SIGBUS in CLD is fixed:
https://code.google.com/p/cld2/issues/detail?id=11
BUG=326023
Review URL: https://codereview.chromium.org/187393005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/common.gypi | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index d68c423..d9adee9 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -432,13 +432,20 @@ 'cld_version%': 2, # For CLD2, the size of the tables that should be included in the build - # Only evaluated if cld_version == 2. + # Only evaluated if cld_version == 2 or if building the CLD2 dynamic data + # tool explicitly. # See third_party/cld_2/cld_2.gyp for more information. # 0: Small tables, lower accuracy # 1: Medium tables, medium accuracy # 2: Large tables, high accuracy 'cld2_table_size%': 2, + # Set the way CLD is compiled. Only evaluated if cld_version == 2. + # 0: static, language scoring tables compiled into the binary + # 1: dynamic, language scoring tables live in a data file that must + # be loaded at runtime. + 'cld2_dynamic%': 0, + # Enable spell checker. 'enable_spellcheck%': 1, @@ -636,6 +643,7 @@ 'enable_extensions%': 0, 'enable_google_now%': 0, 'cld_version%': 1, + 'cld2_dynamic%': 0, 'enable_spellcheck%': 0, 'enable_themes%': 0, 'remoting%': 0, @@ -686,6 +694,7 @@ 'enable_extensions%': 0, 'enable_google_now%': 0, 'cld_version%': 1, + 'cld2_dynamic%': 0, 'enable_printing%': 0, 'enable_session_service%': 0, 'enable_themes%': 0, @@ -1002,6 +1011,7 @@ 'enable_google_now%': '<(enable_google_now)', 'cld_version%': '<(cld_version)', 'cld2_table_size%': '<(cld2_table_size)', + 'cld2_dynamic%': '<(cld2_dynamic)', 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 'disable_ftp_support%': '<(disable_ftp_support)', 'enable_task_manager%': '<(enable_task_manager)', @@ -2513,6 +2523,9 @@ ['cld_version!=0', { 'defines': ['CLD_VERSION=<(cld_version)'], }], + ['cld2_dynamic!=0', { + 'defines': ['CLD2_DYNAMIC_MODE=1'], + }], ['enable_printing==1', { 'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'], }], |