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

Commit 8b8d2771 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Update ravenwood test xml template 

- Moved "java-flags"s out of the <test> element
- Add -Dandroid.ravenwood.version=1
- Add {EXTRA_TEST_RUNNER_CONFIGS}

Bug: 292141694
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh -s
Flag: EXEMPT host test change only
Change-Id: If356e87d374f4d83ab33ac8da005762989db821f
parent 49c20850

core/ravenwood_test_config_template.xml

+18 −12
Original line number Diff line number Diff line
@@ -24,10 +24,8 @@ 
    <option name="null-device" value="true" />

    <option name="do-not-swallow-runner-errors" value="true" />



    {EXTRA_CONFIGS}

    <option name="java-flags" value="-Dandroid.ravenwood.version=1"/>



    <test class="com.android.tradefed.testtype.IsolatedHostTest" >

        <option name="jar" value="{MODULE}.jar" />

    <option name="java-flags" value="--add-modules=jdk.compiler"/>

    <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>

    <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
@@ -40,5 +38,13 @@ 


    <!-- Needed for supporting ParcelFileDescriptor internals -->

    <option name="java-flags" value="--add-exports=java.base/jdk.internal.access=ALL-UNNAMED"/>



    {EXTRA_CONFIGS}



    <test class="com.android.tradefed.testtype.IsolatedHostTest" >



        {EXTRA_TEST_RUNNER_CONFIGS}



        <option name="jar" value="{MODULE}.jar" />

    </test>

</configuration>