Add TEST_MAPPING for architecture-independent cpu_features tests.

am: df048aee24

Change-Id: I5e0c6f89f6f43801f0ca83fb4e940bc0444b6a55

2 files changed, 33 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 804c931..e99c646 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,6 +112,7 @@ cc_binary {
 
 cc_defaults {
     name: "cpu_features-test-defaults",
+    test_suites: ["device-tests"],
     host_supported: true,
     local_include_dirs: [
         "include",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..6bafa8d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,32 @@
+{
+  "presubmit": [
+    {
+      "name": "cpu_features-bit_utils_test",
+      "host": true
+    },
+    {
+      "name": "cpu_features-bit_utils_test"
+    },
+    {
+      "name": "cpu_features-string_view_test",
+      "host": true
+    },
+    {
+      "name": "cpu_features-string_view_test"
+    },
+    {
+      "name": "cpu_features-stack_line_reader_test",
+      "host": true
+    },
+    {
+      "name": "cpu_features-stack_line_reader_test"
+    },
+    {
+      "name": "cpu_features-unix_features_aggregator_test",
+      "host": true
+    },
+    {
+      "name": "cpu_features-unix_features_aggregator_test"
+    }
+  ]
+}