From dd5d287a738fe0f90eb965412eab68c6ccf61c6f Mon Sep 17 00:00:00 2001
From: Ruchir Rastogi <ruchirr@google.com>
Date: Tue, 9 Jun 2020 17:22:53 -0700
Subject: [PATCH] Add libincident_test to MTS

+ remove GtsLibIncidentTests (the native GTS tests) from presubmit

Test: m libincident_test
Test: atest libincident_test
Test: m mts && mts-tradefed run mts -m libincident_test
Bug: 157142853
Change-Id: I5c6ea2edfbd29165ec65108c4a71a56698c76a27
---
 libs/incident/Android.bp      | 12 +++++++++++-
 libs/incident/AndroidTest.xml |  6 +++++-
 libs/incident/TEST_MAPPING    |  3 ---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/libs/incident/Android.bp b/libs/incident/Android.bp
index af64110114111..d291ec001daf0 100644
--- a/libs/incident/Android.bp
+++ b/libs/incident/Android.bp
@@ -95,7 +95,17 @@ cc_test {
     name: "libincident_test",
     test_config: "AndroidTest.xml",
     defaults: ["libincidentpriv_defaults"],
-    test_suites: ["device-tests"],
+    test_suites: ["device-tests", "mts"],
+    compile_multilib: "both",
+    multilib: {
+        lib64: {
+            suffix: "64",
+        },
+        lib32: {
+            suffix: "32",
+        },
+    },
+    require_root: true,
 
     include_dirs: [
         "frameworks/base/libs/incident/include",
diff --git a/libs/incident/AndroidTest.xml b/libs/incident/AndroidTest.xml
index 7c0b04471d139..b6b3f85968263 100644
--- a/libs/incident/AndroidTest.xml
+++ b/libs/incident/AndroidTest.xml
@@ -16,13 +16,17 @@
 <configuration description="Config for libincident_test">
     <option name="test-suite-tag" value="device-tests" />
     <option name="config-descriptor:metadata" key="component" value="misc" />
-    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="libincident_test->/data/local/tmp/libincident_test" />
+        <option name="append-bitness" value="true" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
         <option name="module-name" value="libincident_test" />
     </test>
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.os.statsd" />
+    </object>
 </configuration>
 
diff --git a/libs/incident/TEST_MAPPING b/libs/incident/TEST_MAPPING
index 59ebe7664b5f3..25e000092ecf9 100644
--- a/libs/incident/TEST_MAPPING
+++ b/libs/incident/TEST_MAPPING
@@ -2,9 +2,6 @@
   "presubmit": [
     {
       "name": "libincident_test"
-    },
-    {
-      "name": "GtsLibIncidentTests"
     }
   ]
 }