summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-29 21:04:50 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-29 21:04:50 +0000
commit7c80c11dc1ae2a886b3d6759d41bd04c9be7a60a (patch)
tree506d887b8d68b216fc85cc0e64679912b3cd450a /android_webview
parentdf48884f422dcedbd68152594a66a97bf726cc85 (diff)
downloadchromium_src-7c80c11dc1ae2a886b3d6759d41bd04c9be7a60a.zip
chromium_src-7c80c11dc1ae2a886b3d6759d41bd04c9be7a60a.tar.gz
chromium_src-7c80c11dc1ae2a886b3d6759d41bd04c9be7a60a.tar.bz2
Cleanup stale files from android_webview license check.
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
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/tools/third_party_files_whitelist.txt8
-rwxr-xr-xandroid_webview/tools/webview_licenses.py6
2 files changed, 5 insertions, 9 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt
index 569b8b9..fcf3a4a 100644
--- a/android_webview/tools/third_party_files_whitelist.txt
+++ b/android_webview/tools/third_party_files_whitelist.txt
@@ -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.
@@ -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
diff --git a/android_webview/tools/webview_licenses.py b/android_webview/tools/webview_licenses.py
index 9f8b3f7..d2775e7 100755
--- a/android_webview/tools/webview_licenses.py
+++ b/android_webview/tools/webview_licenses.py
@@ -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