From da93e616703d39eff6d15ff3d48ef5699b850405 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Mon, 14 Apr 2014 17:47:40 +0000 Subject: Cleanup stale files from android_webview license check and fix a small nit. Review URL: https://codereview.chromium.org/236233003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263662 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/tools/third_party_files_whitelist.txt | 13 ------------- android_webview/tools/webview_licenses.py | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt index a5a4139..2f7dd29 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/android_webview/tools/third_party_files_whitelist.txt @@ -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 @@ -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/. @@ -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 diff --git a/android_webview/tools/webview_licenses.py b/android_webview/tools/webview_licenses.py index f9ed196..9f8b3f7 100755 --- a/android_webview/tools/webview_licenses.py +++ b/android_webview/tools/webview_licenses.py @@ -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: -- cgit v1.1