Make checking the existence of the license file optional in the license tool

android_webview/tools/webview_licenses.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Checks third-party licenses for the purposes of the Android WebView build.
 
 The Android tree includes a snapshot of Chromium in order to power the system
 WebView.  This tool checks that all code uses open-source licenses compatible
 with Android, and that we meet the requirements of those licenses. It can also
@@ skipping 35 matching lines @@
     'MPL 1\.1 ?/ ?GPL 2(\.0)? ?/ ?LGPL 2\.1',
     'Microsoft Limited Public License',
     'Microsoft Permissive License',
     'Public Domain',
     'SGI Free Software License B',
     'X11',
   ]
   regex = '^(%s)$' % '|'.join(whitelist)
   result = []
   for directory in _FindThirdPartyDirs():
-    metadata = licenses.ParseDir(directory)
+    metadata = licenses.ParseDir(directory, require_license_file=False)
     if metadata.get('License Android Compatible', 'no') == 'yes':
       continue
     license = re.split(' [Ll]icenses?$', metadata['License'])[0]
     tokens = [x.strip() for x in re.split(' and |,', license) if len(x) > 0]
     for token in tokens:
       if not re.match(regex, token, re.IGNORECASE):
         result.append(directory)
         break
   return result
 
@@ skipping 119 matching lines @@
                                       'third_party_files_whitelist.txt'))
   whitelisted_files = []
   for line in files_data.splitlines():
     match = re.match(r'([^#\s]+)', line)
     if match:
       whitelisted_files.append(match.group(1))
   return _CheckLicenseHeaders(third_party_dirs, whitelisted_files) \
       and all_licenses_valid
 
 
-def _GenerateNoticeFile(print_warnings):
+def GenerateNoticeFile():
   """Generates the contents of an Android NOTICE file for the third-party code.
-  Args:
-    print_warnings: Whether to print warnings.
+  This is used by the snapshot tool.
   Returns:
     The contents of the NOTICE file.
   """
 
   third_party_dirs = _FindThirdPartyDirs()
 
   # Don't forget Chromium's LICENSE file
   content = [_ReadFile('LICENSE')]
 
   # We provide attribution for all third-party directories.
   # TODO(steveblock): Limit this to only code used by the WebView binary.
   for directory in third_party_dirs:
-    license_file = licenses.ParseDir(directory)['License File']
-    if license_file != licenses.NOT_SHIPPED:
+    metadata = licenses.ParseDir(directory, require_license_file=False)
+    license_file = metadata['License File']
+    if license_file and license_file != licenses.NOT_SHIPPED:
       content.append(_ReadFile(license_file))
 
   return '\n'.join(content)
 
 
 def main():
   class FormatterWithNewLines(optparse.IndentedHelpFormatter):
     def format_description(self, description):
       paras = description.split('\n')
       formatted_paras = [textwrap.fill(para, self.width) for para in paras]
@@ skipping 14 matching lines @@
     print "This tool can only be run from the repository root."
     return 1
 
   if args[0] == 'scan':
     if _Scan():
       print 'OK!'
       return 0
     else:
       return 1
   elif args[0] == 'notice':
-    print _GenerateNoticeFile(print_warnings=False)
+    print GenerateNoticeFile()
     return 0
 
   parser.print_help()
   return 1
 
 if __name__ == '__main__':
   sys.exit(main())