diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /android_webview/tools/webview_licenses.py | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'android_webview/tools/webview_licenses.py')
| -rwxr-xr-x | android_webview/tools/webview_licenses.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/android_webview/tools/webview_licenses.py b/android_webview/tools/webview_licenses.py index 0348e9151d..97024650c3 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', @@ -91,7 +91,7 @@ def _CheckLicenseHeaders(excluded_dirs_list, whitelisted_files): """ excluded_dirs_list = [d for d in excluded_dirs_list if not 'third_party' in d] - # Using a commond pattern for third-partyies makes the ignore regexp shorter + # Using a common pattern for third-partyies makes the ignore regexp shorter excluded_dirs_list.append('third_party') # VCS dirs excluded_dirs_list.append('.git') @@ -105,10 +105,14 @@ def _CheckLicenseHeaders(excluded_dirs_list, whitelisted_files): excluded_dirs_list.append('chrome/tools/test/reference_build') # This is tests directory, doesn't exist in the snapshot excluded_dirs_list.append('content/test/data') + # This is a tests directory that doesn't exist in the shipped product. + excluded_dirs_list.append('gin/test') # This is a test output directory excluded_dirs_list.append('data/dom_perf') # Histogram tools, doesn't exist in the snapshot excluded_dirs_list.append('tools/histograms') + # Swarming tools, doesn't exist in the snapshot + excluded_dirs_list.append('tools/swarming_client') # Arm sysroot tools, doesn't exist in the snapshot excluded_dirs_list.append('arm-sysroot') # Data is not part of open source chromium, but are included on some bots. |