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

Commit 768fc687 authored by John Wu's avatar John Wu
Browse files

[Ravenwood] Cleanup RATR implementation and project structure 

- Create a dedicated RATR implementation specifically for device-side
  tests in junit-stub-src so we won't need to worry about device-side
  compatibility when updating RATR.
- Enable Ravenizer on RavenwoodBivalentTest to ensure the "stub"
  RATR is working as intended
- Because the real RATR is now in junit-impl-src, a lot of classes no
  longer need to be in junit-stub-src, as junit-src is now a lot cleaner
- Remove all Ravenwood checks in RATR since the real one will always
  only run on Ravenwood tests
- Remove RATRHook and move the hook callback methods directly in RATR

Flag: EXEMPT host test change only
Bug: 356918135
Test: atest RavenwoodBivalentTest_device_ravenizer
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: I18577373833d8f6390bc685c23b857be65b904dc
parent 7efc6eaa

ravenwood/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ java_library { 
        "hoststubgen-helper-runtime.ravenwood",

        "mockito-ravenwood-prebuilt",

    ],

    visibility: ["//frameworks/base"],

    visibility: [":__subpackages__"],

    jarjar_rules: ":ravenwood-services-jarjar-rules",

}

ravenwood/TEST_MAPPING

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
    { "name": "hoststubgen-test-tiny-test" },

    { "name": "hoststubgen-invoke-test" },

    { "name": "RavenwoodMockitoTest_device" },

    // TODO(b/371215487): Re-enable when the test is fixed.

    // { "name": "RavenwoodBivalentTest_device" },

    { "name": "RavenwoodBivalentTest_device" },

    { "name": "RavenwoodBivalentTest_device_ravenizer" },



    { "name": "RavenwoodBivalentInstTest_nonself_inst" },

    { "name": "RavenwoodBivalentInstTest_self_inst_device" },