From e038f49bca054da7f4734dadb86aefbd81332542 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 29 Oct 2018 12:29:34 -0700
Subject: [PATCH] TEST_MAPPING: add the rest of our actively maintained tests.

We can't add the ones that need a shared library because the
infrastructure doesn't work yet. (We also can't comment this in the file,
because there's no support for comments :-( .)

Bug: N/A
Test: N/A
Change-Id: I4d84f962bbf48fc708df336726c18e48fe206492
---
 TEST_MAPPING             | 24 ++++++++++++++++++++++++
 libziparchive/Android.bp |  1 +
 2 files changed, 25 insertions(+)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index c47230fff..f9c3b4adc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,6 +2,30 @@
   "presubmit": [
     {
       "name": "adbd_test"
+    },
+    {
+      "name": "debuggerd_test"
+    },
+    {
+      "name": "init_tests"
+    },
+    {
+      "name": "libbase_test"
+    },
+    {
+      "name": "libprocinfo_test"
+    },
+    {
+      "name": "memunreachable_test"
+    },
+    {
+      "name": "memunreachable_binder_test"
+    },
+    {
+      "name": "propertyinfoserializer_tests"
+    },
+    {
+      "name": "ziparchive-tests"
     }
   ]
 }
diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index 2095189ec..9538bba10 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -125,6 +125,7 @@ cc_test {
             enabled: true,
         },
     },
+    test_suites: ["device-tests"],
 }
 
 // Performance benchmarks.