diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 01:34:32 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 01:34:32 +0000 |
| commit | e32bfad739108a6c2e841aec42129978287e3628 (patch) | |
| tree | 9bd1c1700a5206c74e013d493ac2ae8eae96d949 | |
| parent | 429e3652788bc6a49da69bc767661a68f63260a7 (diff) | |
| download | chromium_src-e32bfad739108a6c2e841aec42129978287e3628.zip chromium_src-e32bfad739108a6c2e841aec42129978287e3628.tar.gz chromium_src-e32bfad739108a6c2e841aec42129978287e3628.tar.bz2 | |
Add back the license for Chinese/Japanese word list that was lost.
Pull in the ICU-side change.
See http://codereview.chromium.org/3770017 for the ICU-side
change.
BUG=NONE
TEST=Run tools/licenses.py to generate the html for 'about:credits'
and make sure that ICU is listed only once and the license
for 'Chinese/Japanese' word list is present.
Review URL: http://codereview.chromium.org/3815010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63474 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rwxr-xr-x | tools/licenses.py | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -40,7 +40,7 @@ deps = { "/trunk/deps/third_party/WebKit@33467", "src/third_party/icu": - "/trunk/deps/third_party/icu42@62048", + "/trunk/deps/third_party/icu42@63473", "src/third_party/hunspell": "/trunk/deps/third_party/hunspell@60758", diff --git a/tools/licenses.py b/tools/licenses.py index 538159df..8c1c14a 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -59,6 +59,13 @@ PRUNE_DIRS = ('.svn', '.git', # VCS metadata 'out', 'Debug', 'Release', # build files 'layout_tests') # lots of subdirs +ADDITIONAL_PATHS = ( + # The directory with the word list for Chinese and Japanese segmentation + # with different license terms than ICU. + "third_party/icu/source/data/brkitr", +) + + # Directories where we check out directly from upstream, and therefore # can't provide a README.chromium. Please prefer a README.chromium # wherever possible. @@ -183,6 +190,9 @@ def FindThirdPartyDirs(): dirs[:] = [] continue + for dir in ADDITIONAL_PATHS: + third_party_dirs.append(dir) + return third_party_dirs def ScanThirdPartyDirs(): |