commit dd5d287a738fe0f90eb965412eab68c6ccf61c6f
author Ruchir Rastogi <ruchirr@google.com> Tue Jun 09 17:22:53 2020 -0700
committer Ruchir Rastogi <ruchirr@google.com> Thu Jun 11 16:50:28 2020 -0700
tree d5f608ec06f2d745d36649c6195bf7b632e02c65
parent ca4709a9a503996bfce89233e7e5533d3b8480dc

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

diff --git a/libs/incident/Android.bp b/libs/incident/Android.bp
index af64110..d291ec0 100644
--- a/libs/incident/Android.bp
+++ b/libs/incident/Android.bp
@@ -95,7 +95,17 @@
     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",