summaryrefslogtreecommitdiffstats
path: root/android_webview/tools
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 07:40:15 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 07:40:15 +0000
commit1f70e9bdb669f7d69bac9d3c31d4918f19814e9a (patch)
tree014378b8fa39a9275cac920d6d7ff4b4a893aceb /android_webview/tools
parentbdb91d342ffd20bbf6815cc5587cb81f33db4fcd (diff)
downloadchromium_src-1f70e9bdb669f7d69bac9d3c31d4918f19814e9a.zip
chromium_src-1f70e9bdb669f7d69bac9d3c31d4918f19814e9a.tar.gz
chromium_src-1f70e9bdb669f7d69bac9d3c31d4918f19814e9a.tar.bz2
[Android WebView] Relax license parsing for BSD
This adds "2-clause BSD" and "3-clause BSD" to whitelisted licenses. This is only a wording issue, since "BSD 2-clause" and "BSD 3-clause" are already whitelisted. This makes third_party/mach_override pass webview license check, even though that particular library is not used by webview. BUG=315381 NOTRY=true TBR=joth Review URL: https://codereview.chromium.org/62663002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/tools')
-rwxr-xr-xandroid_webview/tools/webview_licenses.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/tools/webview_licenses.py b/android_webview/tools/webview_licenses.py
index 0d12ad2..e3ea04a 100755
--- a/android_webview/tools/webview_licenses.py
+++ b/android_webview/tools/webview_licenses.py
@@ -41,7 +41,7 @@ def GetIncompatibleDirectories():
whitelist = [
'Apache( Version)? 2(\.0)?',
- '(New )?BSD( [23]-Clause)?( with advertising clause)?',
+ '(New )?([23]-Clause )?BSD( [23]-Clause)?( with advertising clause)?',
'L?GPL ?v?2(\.[01])?( or later)?',
'MIT(/X11)?(-like)?',
'MPL 1\.1 ?/ ?GPL 2(\.0)? ?/ ?LGPL 2\.1',