diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 13:43:06 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 13:43:06 +0000 |
| commit | 484de3a0a118d684d8f7803114c7b33e4c35cf9d (patch) | |
| tree | 7a2c91f3400e226857fced262b5b99da9393097c | |
| parent | dccf5a29b33564c741bd7ed90b129304145106f8 (diff) | |
| download | chromium_src-484de3a0a118d684d8f7803114c7b33e4c35cf9d.zip chromium_src-484de3a0a118d684d8f7803114c7b33e4c35cf9d.tar.gz chromium_src-484de3a0a118d684d8f7803114c7b33e4c35cf9d.tar.bz2 | |
Roll v8-i18n r155:157 and update license metadata.
Pick up LICENSE file update in r157 and update license tool metadata to
match.
BUG=160221
TBR=cira@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11369182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167171 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rwxr-xr-x | tools/licenses.py | 6 |
2 files changed, 2 insertions, 6 deletions
@@ -165,7 +165,7 @@ deps = { (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4", "src/third_party/v8-i18n": - (Var("googlecode_url") % "v8-i18n") + "/trunk@155", + (Var("googlecode_url") % "v8-i18n") + "/trunk@157", # When roll to another webgl conformance tests revision, please goto # chrome/test/gpu and run generate_webgl_conformance_test_list.py. diff --git a/tools/licenses.py b/tools/licenses.py index 4f1f1a6..f2e67c4 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -177,11 +177,7 @@ SPECIAL_CASES = { os.path.join('third_party', 'v8-i18n'): { "Name": "Internationalization Library for v8", "URL": "http://code.google.com/p/v8-i18n/", - "License": "Apache 2.0, BSD and others", - # Marked Android compatible for http://crbug.com/160221 - license - # data here should be updated once that's resolved and then this can be - # removed. - "License Android Compatible": "yes", + "License": "Apache 2.0", }, os.path.join('third_party', 'WebKit'): { "Name": "WebKit", |