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

Commit f7903793 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes from topic "activate_com.android.bt-module_in_system_image" into main 

* changes:
  Disable obsolete and deprecated btservices
  [bt] Add the Google module in pixel image
parents 821018bb bb7ed75d

AndroidTestTemplate.xml

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
  <!-- 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.android.btservices" />

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

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

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

  </object>

</configuration>

android/app/tests/unit/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,6 +55,6 @@ 
    <object type="module_controller"

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

        <option name="enable" value="true" />

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

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

    </object>

</configuration>

android/app/tests/unit/GoogleAndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,6 @@ 
    <object type="module_controller"

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

        <option name="enable" value="true" />

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

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

    </object>

</configuration>

android/pandora/gen_cov.py

+2 −2
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ if __name__ == '__main__': 
  parser = argparse.ArgumentParser()

  parser.add_argument(

      '--apex-name',

      default='com.android.btservices',

      help='bluetooth apex name. Default: com.android.btservices')

      default='com.android.bt',

      help='bluetooth apex name. Default: com.android.bt')

  parser.add_argument(

      '--java', action='store_true', help='generate Java coverage')

  parser.add_argument(

android/pandora/server/configs/PtsBotTestMts.xml

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 


    <object type="module_controller"

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

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

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

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

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

    </object>

</configuration>