Remove architecture-specific cpu_features-cpuinfo-*-test tests.
They are no longer useful now that we have cpu_features-cpuinfo_test.
Test: atest --all-abi --test-mapping external/cpu_features:presubmit
Bug: 122712425
Change-Id: I877f96e84de3f7f8ff797241b2adcb13db0eea6e
diff --git a/Android.bp b/Android.bp
index ac007ed..79a3a29 100644
--- a/Android.bp
+++ b/Android.bp
@@ -263,84 +263,13 @@
],
}
-cc_defaults {
- name: "cpu_features-cpuinfo-test-defaults",
- defaults: ["cpu_features-test-defaults"],
- static_libs: [
- "libcpu_features-all_libraries",
- ],
-}
-
-cc_test {
- name: "cpu_features-cpuinfo_x86_test",
- defaults: ["cpu_features-cpuinfo-test-defaults"],
- enabled: false,
- arch: {
- x86: {
- enabled: true,
- },
- x86_64: {
- enabled: true,
- },
- },
- target: {
- windows: {
- enabled: false,
- },
- },
- cflags: [
- "-DCPU_FEATURES_MOCK_CPUID_X86",
- "-Wno-unused-variable",
- ],
- srcs: [
- "test/cpuinfo_x86_test.cc",
- "src/cpuinfo_x86.c",
- ],
-}
-
-cc_test {
- name: "cpu_features-cpuinfo_arm_test",
- defaults: [
- "cpu_features-cpuinfo-test-defaults",
- "stack_line_reader-defaults",
- ],
- enabled: false,
- arch: {
- arm: {
- enabled: true,
- },
- },
- srcs: [
- "test/cpuinfo_arm_test.cc",
- "src/cpuinfo_arm.c",
- ],
-}
-
-cc_test {
- name: "cpu_features-cpuinfo_aarch64_test",
- enabled: false,
- defaults: [
- "cpu_features-cpuinfo-test-defaults",
- "stack_line_reader-defaults",
- ],
- arch: {
- arm64: {
- enabled: true,
- },
- },
- cflags: [
- "-Wno-gnu-designator",
- ],
- srcs: [
- "test/cpuinfo_aarch64_test.cc",
- "src/cpuinfo_aarch64.c",
- ],
-}
-
cc_test {
name: "cpu_features-cpuinfo_test",
defaults: [
- "cpu_features-cpuinfo-test-defaults",
+ "cpu_features-test-defaults",
+ ],
+ static_libs: [
+ "libcpu_features-all_libraries",
],
arch: {
x86: {