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

Commit 6367712d authored by Robin Lee's avatar Robin Lee
Browse files

Update protolog for newer version of javaparser 

One class that was referenced changed its package name.

One creation of boolean[] array was using incorrect syntax that was
previously ignored.

Several tests have updated goldens because the tool is generating
double-spaces where it was generating single-spaces before.

Flag: EXEMPT infra import
Test: atest protologtool-tests
Bug: 370425985
Change-Id: I5bec8ad8808fc0c7c6e3027469cf851e1c7dd4df
parent d917e7b4

tools/protologtool/src/com/android/protolog/tool/ProtoLogTool.kt

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ object ProtoLogTool { 
            cacheClass.addFieldWithInitializer(

                "boolean[]",

                "${group.key}_enabled",

                ArrayCreationExpr().setElementType("boolean[]").setInitializer(

                ArrayCreationExpr().setElementType("boolean").setInitializer(

                    ArrayInitializerExpr().setValues(nodeList)

                ),

                Modifier.Keyword.PUBLIC,

tools/protologtool/src/com/android/protolog/tool/SourceTransformer.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType 
import com.github.javaparser.ast.type.PrimitiveType

import com.github.javaparser.ast.type.Type

import com.github.javaparser.printer.PrettyPrinter

import com.github.javaparser.printer.PrettyPrinterConfiguration

import com.github.javaparser.printer.configuration.PrettyPrinterConfiguration



class SourceTransformer(

    protoLogImplClassName: String,

tools/protologtool/tests/com/android/protolog/tool/EndToEndTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ class EndToEndTest { 
        )

        val outSrcJar = assertLoadSrcJar(output, "out.srcjar")

        Truth.assertThat(outSrcJar["frameworks/base/org/example/Example.java"])

                .containsMatch(Pattern.compile("\\{ String protoLogParam0 = " +

                        "String\\.valueOf\\(argString\\); long protoLogParam1 = argInt; " +

                        "com\\.android\\.internal\\.protolog.ProtoLogImpl_.*\\.d\\(" +

                        "GROUP, -6872339441335321086L, 4, protoLogParam0, protoLogParam1" +

                        "\\); \\}"))

                .contains("String protoLogParam0 = String.valueOf(argString);"

                        + "  long protoLogParam1 = argInt;"

                        + "  com.android.internal.protolog.ProtoLogImpl_454675969.d("

                        + "GROUP, -6872339441335321086L, 4, protoLogParam0, protoLogParam1);"

                        + " }");

    }



    @Test

tools/protologtool/tests/com/android/protolog/tool/SourceTransformerTest.kt

+7 −7

File changed.

Contains only whitespace changes.