Add TEST_MAPPING am: db1064dfc0
am: ba880b42d0

Change-Id: I35f8a602b541dead330d42ab2703e0cfd0402934
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..c694b80
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,20 @@
+{
+  "presubmit": [
+    {
+      "name": "libvintf_test",
+      "host": false
+    },
+    {
+      "name": "libvintf_test",
+      "host": true
+    },
+    {
+      "name": "vintf_object_test",
+      "host": false
+    },
+    {
+      "name": "vintf_object_test",
+      "host": true
+    }
+  ]
+}
diff --git a/test/Android.bp b/test/Android.bp
index 255ed14..36cfe83 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -43,7 +43,11 @@
         android: {
             cflags: ["-DLIBVINTF_TARGET"],
         },
-    }
+    },
+
+    test_suites: [
+        "general-tests",
+    ],
 }
 
 cc_test {
@@ -79,7 +83,11 @@
         android: {
             cflags: ["-DLIBVINTF_TARGET"],
         },
-    }
+    },
+
+    test_suites: [
+        "general-tests",
+    ],
 }
 
 // run this with: ./vintf_object_recovery_test.sh