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

Commit efde2785 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "avatar: use new TF rootcanal target preparer" into main

parents 72a16af5 6f81c7ba

android/pandora/test/AndroidTest.xml

+1 −3
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ 
        <option name="install-arg" value="-r" />

        <option name="install-arg" value="-g" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RunHostCommandTargetPreparer">

        <option name="host-setup-command" value="adb -s $SERIAL forward tcp:6211 vsock:2:7300" />

        <option name="host-teardown-command" value="adb -s $SERIAL forward --remove tcp:6211" />

    <target_preparer class="com.android.tradefed.targetprep.RootcanalForwarderPreparer">

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="run-command" value="cmd bluetooth_manager enable" />

android/pandora/test/config.yml

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ TestBeds: 
  Controllers:

    AndroidDevice: '*'

    BumbleDevice:

    - transport: 'tcp-client:127.0.0.1:6211'

    - transport: 'tcp-client:127.0.0.1:6211'

    - tcp: ${ROOTCANAL_HCI_ADDRESS}

    - tcp: ${ROOTCANAL_HCI_ADDRESS}

- Name: bumble.bumbles

  Controllers:

    BumbleDevice: