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

Commit 27ada52d authored by Oriol Prieto Gasco's avatar Oriol Prieto Gasco Committed by David Duarte
Browse files

Make the btservices apex updatable. 

Also, use the new name "com.android.btservices"

Bug: 237556594
Test: TH

Merged-In: If2443eadfc457da6e040ea3425ed1d5b6f73177a
Change-Id: If2443eadfc457da6e040ea3425ed1d5b6f73177a
(cherry picked from commit 4c187daf)
parent 832603b8

AndroidTestTemplate.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,6 +38,6 @@ 
  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->

  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->

  <object type="module_controller"

  <object type="module_controller"

          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

      <option name="mainline-module-package-name" value="com.google.android.bluetooth" />

      <option name="mainline-module-package-name" value="com.android.btservices" />

  </object>

  </object>

</configuration>
 
</configuration>

android/app/tests/unit/AndroidTest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,6 +48,6 @@ 
    <!-- Only run Cts Tests in MTS if the Bluetooth Mainline module is installed. -->

    <!-- Only run Cts Tests in MTS if the Bluetooth Mainline module is installed. -->

    <object type="module_controller"

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.bluetooth" />

        <option name="mainline-module-package-name" value="com.android.btservices" />

    </object>

    </object>

</configuration>
 
</configuration>

apex/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ apex { 
    ],

    ],

    key: "com.android.btservices.key",

    key: "com.android.btservices.key",

    certificate: ":com.android.btservices.certificate",

    certificate: ":com.android.btservices.certificate",

    updatable: false,

    updatable: true,

    compressible: false,

    compressible: false,

}

}

framework/tests/unit/AndroidTest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,6 @@ 
    <!-- Only run FrameworkBluetoothTests in MTS if the Bluetooth Mainline module is installed. -->

    <!-- Only run FrameworkBluetoothTests in MTS if the Bluetooth Mainline module is installed. -->

    <object type="module_controller"

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.bluetooth" />

        <option name="mainline-module-package-name" value="com.android.btservices" />

    </object>

    </object>

</configuration>
 
</configuration>

service/tests/AndroidTest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct" />

    <option name="test-tag" value="ServiceBluetoothTests" />

    <option name="test-tag" value="ServiceBluetoothTests" />

    <option name="config-descriptor:metadata" key="mainline-param"

    <option name="config-descriptor:metadata" key="mainline-param"

            value="com.google.android.bluetooth.apex" />

            value="com.google.android.btservices.apex" />

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

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

        <option name="package" value="com.android.server.bluetooth.test" />

        <option name="package" value="com.android.server.bluetooth.test" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
@@ -31,6 +31,6 @@ 
    <!-- Only run ServiceBluetoothTests in MTS if the Bluetooth Mainline module is installed. -->

    <!-- Only run ServiceBluetoothTests in MTS if the Bluetooth Mainline module is installed. -->

    <object type="module_controller"

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.bluetooth" />

        <option name="mainline-module-package-name" value="com.android.btservices" />

    </object>

    </object>

</configuration>
 
</configuration>