Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e01525de authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure ProtoLogTool processing errors are reported" into main

parents 7d3a2f38 af4b8f07
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -440,7 +440,10 @@ object ProtoLogTool {
                    println("CodeProcessingException " +
                            "(${index + 1}/${injector.processingErrors.size}): \n${it.message}\n")
                }
                exitProcess(1)
                // Do not fail the build if there are processing errors.
                // TODO (b/370425985): Set to 1 once the bug is fixed, so we fail the build if there
                //  are processing errors.
                exitProcess(0)
            }
        } catch (ex: InvalidCommandException) {
            println("InvalidCommandException: \n${ex.message}\n")
@@ -464,8 +467,7 @@ object ProtoLogTool {
    }

    var injector = object : Injector {
        override val processingErrors: MutableList<CodeProcessingException>
            get() = mutableListOf()
        override val processingErrors: MutableList<CodeProcessingException> = mutableListOf()
        override fun fileOutputStream(file: String) = FileOutputStream(file)
        override fun readText(file: File) = file.readText()
        override fun readLogGroups(jarPath: String, className: String) =