Skip to content

Commit

Permalink
Cleanup stale files from android_webview license check and fix a smal…
Browse files Browse the repository at this point in the history
…l nit.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263662 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thestig@chromium.org committed Apr 14, 2014
1 parent d6a8634 commit da93e61
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
13 changes: 0 additions & 13 deletions android_webview/tools/third_party_files_whitelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ chrome/browser/resources/file_manager/foreground/js/main_scripts.js
# String 'copyright' used in code.
chrome/browser/resources/file_manager/foreground/js/media/mediaplayer_scripts.js
# String 'copyright' used in code.
chrome/browser/resources/file_manager/audio_player/js/audio_player_scripts.js
# String 'copyright' used in code.
chrome/browser/resources/file_manager/foreground/js/media/video_player_scripts.js
# String 'copyright' used in code.
chrome/browser/resources/video_player/js/video_player_scripts.js
# String 'copyright' used in code.
chrome/common/importer/firefox_importer_utils.cc
Expand Down Expand Up @@ -158,12 +154,6 @@ tools/traceline/traceline/sidestep/mini_disassembler.cc
ui/base/clipboard/clipboard_util_win.cc
# Copyright The Chromium Authors, Apple Inc; BSD license. Not used on Android.
ui/base/dragdrop/os_exchange_data_provider_win.cc
# Copyright The Chromium Authors, Apple Inc, Michael Emmel, Holger Hans Peter
# Freyther, Collabora Ltd, Google Inc; BSD license. Not used on Android.
ui/events/keycodes/keyboard_code_conversion_gtk.cc
# Copyright The Chromium Authors, Apple Inc, Michael Emmel, Holger Hans Peter
# Freyther, Collabora Ltd, Google Inc; BSD license. Not used on Android.
ui/events/keycodes/keyboard_code_conversion_gtk.h
# Copyright The Chromium Authors, Michael Emmel, Google Inc; BSD license. This
# third-party code is taken from WebKit, the license for which we already pick
# up from webkit/.
Expand All @@ -186,8 +176,5 @@ 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
# Copyright Tim Copperfield and Christian Dywan; LGPL license. Not used on
# Android.
content/common/cursors/webcursor_gtk_data.h
# False positive. This is a generated file which includes polymer code.
chrome/browser/resources/pdf/index.js
2 changes: 1 addition & 1 deletion android_webview/tools/webview_licenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def _CheckLicenseHeaders(excluded_dirs_list, whitelisted_files):
stale = set(whitelisted_files) - set(offending_files)
if stale:
print 'The following files are whitelisted unnecessarily. You must ' \
' remove the following files from the whitelist.\n%s' % \
'remove the following files from the whitelist.\n%s' % \
'\n'.join(sorted(stale))

if unknown:
Expand Down

0 comments on commit da93e61

Please sign in to comment.