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

Commit 2e4b627d authored by David Srbecky's avatar David Srbecky
Browse files

Revert "Revert "Add template to prevent sharding of some bt test..." 

Revert submission 2508278

Reason for revert: Breaks many builds

Reverted changes: /q/submissionid:2508278

Bug: 275453018
Change-Id: I496d01595c06921933a3cd906d5b840b7b94f4c6
parent 95ced0c7

Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -67,3 +67,8 @@ filegroup { 
        "AndroidTestTemplate.xml",

    ],

}



filegroup {

    name: "BluetoothGTestNotShardableConfigTemplate",

    srcs: ["AndroidGtestNotShardableTemplate.xml"],

}

AndroidGtestNotShardableTemplate.xml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs {MODULE}.">

  <option name="not-shardable" value="true" />



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

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

  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

        <option name="append-bitness" value="true" />

    </target_preparer>

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

    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

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

    <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" />

  </target_preparer>

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

    <option name="device-path" value="/data/vendor/ssrdump" />

  </target_preparer>

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

    <option name="native-test-device-path" value="/data/local/tmp" />

    <option name="module-name" value="{MODULE}" />

    <option name="run-test-as" value="0" />

  </test>



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

  </object>

</configuration>

system/bta/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -960,4 +960,9 @@ cc_test { 
            undefined: true,

        },

    },

    target: {

        android: {

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

}

system/btif/Android.bp

+18 −0
Original line number Diff line number Diff line
@@ -334,6 +334,11 @@ cc_test { 
        "libosi",

    ],

    cflags: ["-DBUILDCFG"],

    target: {

        android: {

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

}



// btif rc unit tests for target
@@ -372,6 +377,11 @@ cc_test { 
        cfi: true,

        misc_undefined: ["bounds"],

    },

    target: {

        android: {

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

}



// btif config cache unit tests for target
@@ -410,6 +420,7 @@ cc_test { 
            static_libs: [

                "android.system.suspend.control-V1-ndk",

            ],

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

}
@@ -438,6 +449,11 @@ cc_test { 
        "libosi",

    ],

    cflags: ["-DBUILDCFG"],

    target: {

        android: {

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

}



cc_test {
@@ -553,6 +569,7 @@ cc_test { 
                "libbinder_ndk",

                "android.hardware.bluetooth.audio-V3-ndk",

            ],

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

    sanitize: {
@@ -675,6 +692,7 @@ cc_test { 
                "libbinder_ndk",

                "android.hardware.bluetooth.audio-V3-ndk",

            ],

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

    sanitize: {

system/gd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ cc_test { 
                "libutils",

                "libcutils",

            ],

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

        host_linux: {

            shared_libs: [