summaryrefslogtreecommitdiffstats
path: root/tools/checklicenses
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 19:33:06 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 19:33:06 +0000
commit800d4ac514cf25d8184c35bb6d3beda62055479f (patch)
tree472e403263d45f4050916d81657bc30dd34a80d5 /tools/checklicenses
parent45ea1db66e0895c2ad3aa6a71eba0ab75917d557 (diff)
downloadchromium_src-800d4ac514cf25d8184c35bb6d3beda62055479f.zip
chromium_src-800d4ac514cf25d8184c35bb6d3beda62055479f.tar.gz
chromium_src-800d4ac514cf25d8184c35bb6d3beda62055479f.tar.bz2
Make licensecheck.pl understand the "GPL with bison expection" license. Whitelist it in checklicenses.py.
BUG=105232 TEST=checklicenses.py still passes. Review URL: http://codereview.chromium.org/9113003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checklicenses')
-rwxr-xr-xtools/checklicenses/checklicenses.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 9b40d19..e9e9be6 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -52,6 +52,8 @@ WHITELISTED_LICENSES = [
'BSL (v1.0)',
# TODO(phajdan.jr): Make licensecheck not print the comma after 3.1.
'BSL (v1.0) GPL (v3.1,)',
+ 'GPL (v3 or later) with Bison parser exception',
+ 'GPL with Bison parser exception',
'ISC',
'LGPL',
'LGPL (v2)',
@@ -186,11 +188,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'UNKNOWN',
],
- 'third_party/angle/src/compiler': [
- # http://crbug.com/105232
- 'GPL',
- 'GPL (v3 or later)',
- ],
'third_party/ashmem/ashmem.h': [ # http://crbug.com/98116
'UNKNOWN',
],