summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-04 12:27:38 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-04 12:27:38 +0000
commit697f88738e456b0eb4291c297095a72f40bdb7b4 (patch)
treedc65b4d4c27ec279319ba1176b04ccfbd091e3c3 /android_webview
parent6ef886f50bee3186dcbf337e76a95c983aec1b07 (diff)
downloadchromium_src-697f88738e456b0eb4291c297095a72f40bdb7b4.zip
chromium_src-697f88738e456b0eb4291c297095a72f40bdb7b4.tar.gz
chromium_src-697f88738e456b0eb4291c297095a72f40bdb7b4.tar.bz2
Fix License string in scrypt/README.chromium, update Android WebView checker
In README.chromium, BSD license should be written as "BSD N-Clause License". Also, update Android WebView's license checker to accept BSD 2-Clause. TBR=torne@chromium.org,bcwhite@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11742039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-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 3170d10..0d2a7af 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( 3-Clause)?( with advertising clause)?',
+ '(New )?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',