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

Commit 26ae2297 authored by Oriol Prieto Gasco's avatar Oriol Prieto Gasco Committed by William Escande
Browse files

Make the btservices apex updatable. 

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

Bug: 237556594
Test: TH
Ignore-AOSP-First: LSC

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

AndroidTestTemplate.xml

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

  <object type="module_controller"

          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>

</configuration>

android/app/tests/unit/AndroidTest.xml

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

    <object type="module_controller"

            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>

</configuration>

apex/Android.bp

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

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

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

    updatable: false,

    updatable: true,

    compressible: false,

}

framework/tests/unit/AndroidTest.xml

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

    <object type="module_controller"

            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>

</configuration>

service/tests/AndroidTest.xml

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

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

    <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" >

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

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

    <object type="module_controller"

            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>

</configuration>