summaryrefslogtreecommitdiffstats
path: root/tools/checklicenses
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 18:08:52 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 18:08:52 +0000
commit971cc68d9d4432ad4e9a942fbe4ae7e61ba2d16f (patch)
treeada487bf6f45fed299a0386a8a79d58e929b5eb5 /tools/checklicenses
parent554803b6b16ebce7aa94ba5d28088099ae6554e3 (diff)
downloadchromium_src-971cc68d9d4432ad4e9a942fbe4ae7e61ba2d16f.zip
chromium_src-971cc68d9d4432ad4e9a942fbe4ae7e61ba2d16f.tar.gz
chromium_src-971cc68d9d4432ad4e9a942fbe4ae7e61ba2d16f.tar.bz2
checklicenses: Recognize the Independent JPEG Group's license.
BUG=98313,374943 NOTRY=true Review URL: https://codereview.chromium.org/294763003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checklicenses')
-rwxr-xr-xtools/checklicenses/checklicenses.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 73d0763..31e490b 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -58,6 +58,7 @@ WHITELISTED_LICENSES = [
'GPL (v2 or later) with libtool exception',
'GPL (v3 or later) with Bison parser exception',
'GPL with Bison parser exception',
+ 'Independent JPEG Group License',
'ISC',
'LGPL (unversioned/unknown version)',
'LGPL (v2)',
@@ -206,9 +207,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'third_party/libjingle/source/talk': [ # http://crbug.com/98310
'UNKNOWN',
],
- 'third_party/libjpeg': [ # http://crbug.com/98313
- 'UNKNOWN',
- ],
'third_party/libjpeg_turbo': [ # http://crbug.com/98314
'UNKNOWN',
],