make apf_run_test run in host-unit-testsandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4

Instead of explicit test-mapping config use the host-unit-tests setup
go/a-unit-tests

Change-Id: Iac7920db0dc4f4fa17427c78fa13b496daa01208
Test: presubmit
Bug: 192278266

2 files changed, 4 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index c0d3722..dad6f38 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,7 +74,6 @@ sh_test_host {
     name: "apf_run_test",
     src: "apf_run_test.sh",
     filename: "apf_run_test.sh",
-    test_suites: ["general-tests"],
     test_config: "apf_run_test.xml",
     data: ["testdata/*"],
     data_bins: ["apf_run"],
@@ -86,4 +85,7 @@ sh_test_host {
             enabled: false,
         },
     },
+    test_options: {
+        unit_test: true,
+    },
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 564bf92..f590b05 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,7 +1,5 @@
 {
     "presubmit": [
-        { "name": "NetworkStackTests" },
-        { "name": "apf_run_test",
-          "host": true }
+        { "name": "NetworkStackTests" }
     ]
 }