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

Commit 0f059ddb authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó Committed by Android (Google) Code Review
Browse files

Merge "Make the btservices apex updatable." into tm-mainline-prod

parents 303b41b8 4c187daf

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/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,6 @@ 
    <!-- Only run BluetoothTests 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="com.android.server.bluetooth.CustomTestRunner" />
@@ -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>