Merge "When a Checker assertion cannot be parsed, display it."

2 files changed, 2 insertions, 2 deletions

diff --git a/tools/checker/checker.py b/tools/checker/checker.py
index ed630e3d12..4e516deee0 100755
--- a/tools/checker/checker.py
+++ b/tools/checker/checker.py
@@ -62,7 +62,7 @@ def DumpPass(outputFilename, passName):
 def FindCheckerFiles(path):
   """ Returns a list of files to scan for check annotations in the given path.
       Path to a file is returned as a single-element list, directories are
-      recursively traversed and all '.java' files returned.
+      recursively traversed and all '.java' and '.smali' files returned.
   """
   if not path:
     Logger.fail("No source path provided")
diff --git a/tools/checker/file_format/checker/parser.py b/tools/checker/file_format/checker/parser.py
index 33735cbea0..f354395171 100644
--- a/tools/checker/file_format/checker/parser.py
+++ b/tools/checker/file_format/checker/parser.py
@@ -76,7 +76,7 @@ def __processLine(line, lineNo, prefix, fileName):
   if notLine is not None:
     return (notLine, TestAssertion.Variant.Not, lineNo), None
 
-  Logger.fail("Checker assertion could not be parsed", fileName, lineNo)
+  Logger.fail("Checker assertion could not be parsed: '" + line + "'", fileName, lineNo)
 
 def __isMatchAtStart(match):
   """ Tests if the given Match occurred at the beginning of the line. """