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

Commit 811a84b3 authored by John Wu's avatar John Wu
Browse files

[Ravenwood] Re-enable RavenwoodBivalentTest_device_ravenizer 

Disable JDK patches when enabling Ravenizer on device tests

Test: TH
Flag: EXEMPT host tool change only
Bug: 411506416
Change-Id: I662051ff8d2f108df36aad09a6971ac2e28d8735
parent 69b9b50f

ravenwood/TEST_MAPPING

+1 −4
Original line number Diff line number Diff line
@@ -7,10 +7,7 @@ 
    { "name": "hoststubgen-invoke-test" },

    { "name": "RavenwoodMockitoTest_device" },

    { "name": "RavenwoodBivalentTest_device" },



    // Running ravenizer on device side tests is unsupported: b/411506416

    // { "name": "RavenwoodBivalentTest_device_ravenizer" },



    { "name": "RavenwoodBivalentTest_device_ravenizer" },

    { "name": "RavenwoodBivalentInstTest_nonself_inst" },

    { "name": "RavenwoodBivalentInstTest_self_inst_device" },

ravenwood/tests/bivalenttest/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -128,5 +128,6 @@ android_test { 
    defaults: ["ravenwood-bivalent-device-defaults"],

    ravenizer: {

        enabled: true,

        flags: ["--no-jdk-patch"],

    },

}

ravenwood/tools/hoststubgen/lib/com/android/hoststubgen/HostStubGenClassProcessor.kt

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ class HostStubGenClassProcessor( 
        // Connect to the base visitor

        var outVisitor: ClassVisitor = base



        if (!options.disableJdkPatch.get) {

            outVisitor = JdkPatchVisitor(outVisitor)

        }



        if (options.enableClassChecker.get) {

            outVisitor = CheckClassAdapter(outVisitor)

ravenwood/tools/hoststubgen/lib/com/android/hoststubgen/HostStubGenClassProcessorOptions.kt

+5 −2
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ open class HostStubGenClassProcessorOptions( 


    val throwExceptionType: SetOnce<String> = SetOnce("java.lang.UnsupportedOperationException"),



    val disableJdkPatch: SetOnce<Boolean> = SetOnce(false),



    val enableClassChecker: SetOnce<Boolean> = SetOnce(false),

    val enablePreTrace: SetOnce<Boolean> = SetOnce(false),

    val enablePostTrace: SetOnce<Boolean> = SetOnce(false),
@@ -136,8 +138,9 @@ open class HostStubGenClassProcessorOptions( 


            "--delete-finals" -> deleteFinals.set(true)



            "--throw-exception" ->

                throwExceptionType.set(nextArg())

            "--throw-exception" -> throwExceptionType.set(nextArg())



            "--no-jdk-patch" -> disableJdkPatch.set(true)



            // Following options are for debugging.

            "--enable-class-checker" -> enableClassChecker.set(true)