summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.bp5
-rw-r--r--AndroidGtestNotShardableTemplate.xml47
-rw-r--r--system/bta/Android.bp5
-rw-r--r--system/btif/Android.bp18
-rw-r--r--system/gd/Android.bp1
-rw-r--r--system/stack/Android.bp95
6 files changed, 0 insertions, 171 deletions
diff --git a/Android.bp b/Android.bp
index 39deffb5f0..521a562865 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,8 +67,3 @@ filegroup {
"AndroidTestTemplate.xml",
],
}
-
-filegroup {
- name: "BluetoothGTestNotShardableConfigTemplate",
- srcs: ["AndroidGtestNotShardableTemplate.xml"],
-}
diff --git a/AndroidGtestNotShardableTemplate.xml b/AndroidGtestNotShardableTemplate.xml
deleted file mode 100644
index 7d2abe4e23..0000000000
--- a/AndroidGtestNotShardableTemplate.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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>
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 0cc41815f6..f19cd19aff 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -960,9 +960,4 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index eadd5618f4..7e201380c1 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -334,11 +334,6 @@ cc_test {
"libosi",
],
cflags: ["-DBUILDCFG"],
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// btif rc unit tests for target
@@ -377,11 +372,6 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// btif config cache unit tests for target
@@ -420,7 +410,6 @@ cc_test {
static_libs: [
"android.system.suspend.control-V1-ndk",
],
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
},
},
}
@@ -449,11 +438,6 @@ cc_test {
"libosi",
],
cflags: ["-DBUILDCFG"],
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -569,7 +553,6 @@ cc_test {
"libbinder_ndk",
"android.hardware.bluetooth.audio-V3-ndk",
],
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
},
},
sanitize: {
@@ -692,7 +675,6 @@ cc_test {
"libbinder_ndk",
"android.hardware.bluetooth.audio-V3-ndk",
],
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
},
},
sanitize: {
diff --git a/system/gd/Android.bp b/system/gd/Android.bp
index 13ec09bd40..8697ec0493 100644
--- a/system/gd/Android.bp
+++ b/system/gd/Android.bp
@@ -478,7 +478,6 @@ cc_test {
"libutils",
"libcutils",
],
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
},
host_linux: {
shared_libs: [
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 6bc7d54119..ea82d1d899 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -355,11 +355,6 @@ cc_test {
whole_static_libs: [
"libbluetooth-for-tests",
],
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -428,11 +423,6 @@ cc_test {
sanitize: {
cfi: false,
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// Bluetooth stack smp unit tests for target
@@ -497,11 +487,6 @@ cc_test {
"libgmock",
"libosi",
],
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// Bluetooth stack multi-advertising unit tests for target
@@ -543,11 +528,6 @@ cc_test {
sanitize: {
cfi: false,
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// Bluetooth stack advertise data parsing unit tests for target
@@ -576,11 +556,6 @@ cc_test {
"liblog",
"libgmock",
],
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// Bluetooth stack connection multiplexing
@@ -620,11 +595,6 @@ cc_test {
sanitize: {
cfi: false,
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -674,11 +644,6 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -734,11 +699,6 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -881,11 +841,6 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// gatt sr hash test
@@ -928,11 +883,6 @@ cc_test {
"libgmock",
"libosi",
],
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// Iso manager unit tests
@@ -980,11 +930,6 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// EATT unit tests
@@ -1040,11 +985,6 @@ cc_test {
sanitize: {
cfi: false,
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -1157,11 +1097,6 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -1208,11 +1143,6 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -1268,11 +1198,6 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -1337,11 +1262,6 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -1421,11 +1341,6 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
cc_test {
@@ -1571,11 +1486,6 @@ cc_test {
undefined: true,
},
},
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
// Bluetooth stack connection multiplexing
@@ -1619,9 +1529,4 @@ cc_test {
"liblog",
"libgmock",
],
- target: {
- android: {
- test_config_template: ":BluetoothGTestNotShardableConfigTemplate",
- },
- },
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-20 16:37:57 +0000