Update webview license tool to match licenses.py.

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 40 matching lines @@
     'Public Domain',
     'SGI Free Software License B',
     'X11',
   ]
   regex = '^(%s)$' % '|'.join(whitelist)
   result = []
   for directory in _FindThirdPartyDirs():
     if directory in known_issues.KNOWN_ISSUES:
       result.append(directory)
       continue
-    metadata = licenses.ParseDir(directory, REPOSITORY_ROOT,
-                                 require_license_file=False)
+    try:
+      metadata = licenses.ParseDir(directory, REPOSITORY_ROOT,
+                                   require_license_file=False)
+    except licenses.LicenseError as e:
+      print 'Got LicenseError while scanning ' + directory
+      raise
     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 109 matching lines @@
     # Apache 2.0 license. See
     # https://code.google.com/p/chromium/issues/detail?id=140478.
     os.path.join('third_party', 'bidichecker'),
     # Isn't checked out on clients
     os.path.join('third_party', 'gles2_conform'),
     # The llvm-build doesn't exist for non-clang builder
     os.path.join('third_party', 'llvm-build'),
     # Binaries doesn't apply to android
     os.path.join('third_party', 'widevine'),
   ]
-  return licenses.FindThirdPartyDirs(prune_paths, REPOSITORY_ROOT)
+  third_party_dirs = licenses.FindThirdPartyDirs(prune_paths, REPOSITORY_ROOT)
+  return licenses.FilterDirsWithFiles(third_party_dirs, REPOSITORY_ROOT)
 
 
 def _Scan():
   """Checks that license meta-data is present for all third-party code.
   Returns:
     Whether the check succeeded.
   """
 
   third_party_dirs = _FindThirdPartyDirs()
 
@@ skipping 69 matching lines @@
       return 1
   elif args[0] == 'notice':
     print GenerateNoticeFile()
     return 0
 
   parser.print_help()
   return 1
 
 if __name__ == '__main__':
   sys.exit(main())