summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 19:33:53 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 19:33:53 +0000
commitc1482c37c09dcfab9711aa34848ba914957433a1 (patch)
tree66a0b0f839f4a0c335556c6ae5e878707baca4d9 /tools
parent7c183529e377f13d0cecf2c0dd4c806f08be8dcf (diff)
downloadchromium_src-c1482c37c09dcfab9711aa34848ba914957433a1.zip
chromium_src-c1482c37c09dcfab9711aa34848ba914957433a1.tar.gz
chromium_src-c1482c37c09dcfab9711aa34848ba914957433a1.tar.bz2
Roll ANGLE r887:r889 and expand and clarify the reason for its special
exception in checklicenses.py. licensecheck.pl needs to understand the Bison "special exception". BUG=105232 TEST=ran checklicenses.py Review URL: http://codereview.chromium.org/8677001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/checklicenses/checklicenses.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 6383d99..4fd2c05 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -169,7 +169,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'UNKNOWN',
],
'third_party/WebKit/Source/ThirdParty/ANGLE/src/compiler': [
+ # http://crbug.com/105232
'GPL',
+ 'GPL (v3 or later)',
],
'third_party/WebKit/Source/JavaScriptCore/tests/mozilla': [
'GPL',
@@ -185,7 +187,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
],
'third_party/angle/src/compiler': [
+ # http://crbug.com/105232
'GPL',
+ 'GPL (v3 or later)',
],
'third_party/ashmem/ashmem.h': [ # http://crbug.com/98116
'UNKNOWN',