Skip to content

Commit

Permalink
Cleanup stale files from android_webview license check.
Browse files Browse the repository at this point in the history
Also check for missing files in the white list.

NOTRY=true

Review URL: https://codereview.chromium.org/301903002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273593 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thestig@chromium.org committed May 29, 2014
1 parent df48884 commit 7c80c11
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
8 changes: 0 additions & 8 deletions android_webview/tools/third_party_files_whitelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,16 +163,10 @@ ui/base/dragdrop/os_exchange_data_provider_win.cc
# up from webkit/.
ui/events/keycodes/keyboard_codes_posix.h
# String 'copyright' used in code.
ui/file_manager/gallery/js/gallery_scripts.js
# String 'copyright' used in code.
ui/file_manager/file_manager/foreground/js/photo/gallery_scripts.js
# String 'copyright' used in code.
ui/file_manager/file_manager/foreground/js/main_scripts.js
# String 'copyright' used in code.
ui/file_manager/file_manager/foreground/js/media/mediaplayer_scripts.js
# String 'copyright' used in code.
ui/file_manager/file_manager/audio_player/js/audio_player_scripts.js
# String 'copyright' used in code.
ui/file_manager/video_player/js/video_player_scripts.js
# This third-party code is taken from Mozilla, but is copyright Google and has
# been re-licensed under the Chromium license.
Expand All @@ -192,5 +186,3 @@ webkit/browser/appcache/manifest_parser.h
# and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from
# Mozilla, the license for which we already pick up from third_party/npapi/.
webkit/child/multipart_response_delegate.h
# False positive. This is a generated file which includes polymer code.
chrome/browser/resources/pdf/index.js
6 changes: 5 additions & 1 deletion android_webview/tools/webview_licenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,14 @@ def _CheckLicenseHeaders(excluded_dirs_list, whitelisted_files):
print 'The following files are whitelisted unnecessarily. You must ' \
'remove the following files from the whitelist.\n%s' % \
'\n'.join(sorted(stale))
missing = [f for f in whitelisted_files if not os.path.exists(f)]
if missing:
print 'The following files are whitelisted, but do not exist.\n%s' % \
'\n'.join(sorted(missing))

if unknown:
return ScanResult.Errors
elif stale:
elif stale or missing:
return ScanResult.Warnings
else:
return ScanResult.Ok
Expand Down

0 comments on commit 7c80c11

Please sign in to comment.